diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8e7fce11d5..4385a2db7a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-05  Not Zed  <NotZed@Ximian.com>
+
+	** See bug #312397.
+
+	* em-format-quote.c (emfq_format_message): if we are rendering an
+	attached message, include the headers always and a marker for it.
+
 2005-08-07  Rodney Dawes  <dobey@novell.com>
 
 	* em-folder-browser.c (emfb_search_items):
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 90751ee48f..87f9fb96fc 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -384,8 +384,11 @@ emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, con
 				    "<blockquote type=cite>\n"
 				    "<font color=\"#%06x\">\n",
 				    emfq->citation_colour & 0xffffff);
-	
-	if (emfq->flags & EM_FORMAT_QUOTE_HEADERS)
+
+	if (((CamelMimePart *)emf->message) != part) {
+		camel_stream_printf(stream,  "%s</br>\n", _("-------- Forwarded Message --------"));
+		emfq_format_headers (emfq, stream, (CamelMedium *)part);
+	} else if (emfq->flags & EM_FORMAT_QUOTE_HEADERS)
 		emfq_format_headers (emfq, stream, (CamelMedium *)part);
 	
 	em_format_part (emf, stream, part);