Index: e-util/e-html-utils.c
===================================================================
--- e-util/e-html-utils.c	(revision 33561)
+++ e-util/e-html-utils.c	(working copy)
@@ -138,30 +138,9 @@
 static gboolean
 is_citation (const unsigned char *c, gboolean saw_citation)
 {
-	const unsigned char *p;
-
-	if (*c != '>')
-		return FALSE;
-
-	/* A line that starts with a ">" is a citation, unless it's
-	 * just mbox From-mangling...
-	 */
-	if (strncmp (c, ">From ", 6) != 0)
-		return TRUE;
-
-	/* If the previous line was a citation, then say this
-	 * one is too.
-	 */
-	if (saw_citation)
-		return TRUE;
-
-	/* Same if the next line is */
-	p = (const unsigned char *)strchr ((const char *)c, '\n');
-	if (p && *++p == '>')
-		return TRUE;
-
-	/* Otherwise, it was just an isolated ">From" line. */
-	return FALSE;
+	/* here was handled mbox From-mangling, but nothing like that is needed,
+	   because mbox is erasing '>From' itself now */
+	return *c == '>';
 }
 
 /**
Index: e-util/ChangeLog
===================================================================
--- e-util/ChangeLog	(revision 33561)
+++ e-util/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2007-05-22  Milan Crha  <mcrha@redhat.com>
+
+	** Fixes bug #245683
+	
+	*e-html-utils.c: (is_citation): removed mbox From-mangling, mbox
+	do this itself now
+
 2007-05-04  Milan Crha  <mcrha@redhat.com>
 
 	** Fixes bug #432867
