diff -up evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c.composer-mangled-quotation evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c

--- evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c.composer-mangled-quotation	2018-07-30 15:37:05.000000000 +0200

+++ evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c	2018-11-09 13:27:45.699170089 +0100

@@ -1205,6 +1205,120 @@ test_bug_750636 (TestFixture *fixture)

 		g_test_fail ();

 }

+static void

+test_issue_86 (TestFixture *fixture)

+{

+	const gchar *source_text =

+		"normal text\n"

+		"\n"

+		"> level 1\n"

+		"> level 1\n"

+		"> > level 2\n"

+		"> > level 2\n"

+		"> >\n"

+		"> > level 2\n"

+		">\n"

+		"> level 1\n"

+		"> level 1\n"

+		">\n"

+		"> > > level 3\n"

+		"> > > level 3\n"

+		">\n"

+		"> > level 2\n"

+		"> > level 2\n"

+		">\n"

+		"> level 1\n"

+		"\n"

+		"back normal text\n";

+	gchar *converted, *to_insert;

+

+	if (!test_utils_process_commands (fixture,

+		"mode:html\n")) {

+		g_test_fail ();

+		return;

+	}

+

+	converted = camel_text_to_html (source_text,

+		CAMEL_MIME_FILTER_TOHTML_PRE |

+		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |

+		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES |

+		CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION,

+		0xDDDDDD);

+

+	g_return_if_fail (converted != NULL);

+

+	to_insert = g_strconcat (converted,

+		""

+		"",

+		NULL);

+

+	test_utils_insert_content (fixture, to_insert,

+		E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);

+

+	if (!test_utils_run_simple_test (fixture,

+		"",

+		HTML_PREFIX "
On Today, User wrote:
"

+		"
"

+			"
normal text
"

+			"

"

+			"
"

+				"
level 1
"

+				"
level 1
"

+				"
"

+					"
level 2
"

+					"
level 2
"

+					"

"

+					"
level 2
"

+				""

+				"

"

+				"
level 1
"

+				"
level 1
"

+				"

"

+				"
"

+					"
"

+						"
level 3
"

+						"
level 3
"

+					""

+				""

+				"

"

+				"
"

+					"
level 2
"

+					"
level 2
"

+				""

+				"

"

+				"
level 1
"

+			""

+			"

"

+			"
back normal text
"

+		"" HTML_SUFFIX,

+		"On Today, User wrote:\n"

+		"> normal text\n"

+		"> \n"

+		"> > level 1\n"

+		"> > level 1\n"

+		"> > > level 2\n"

+		"> > > level 2\n"

+		"> > > \n"

+		"> > > level 2\n"

+		"> > \n"

+		"> > level 1\n"

+		"> > level 1\n"

+		"> > \n"

+		"> > > > level 3\n"

+		"> > > > level 3\n"

+		"> > \n"

+		"> > > level 2\n"

+		"> > > level 2\n"

+		"> > \n"

+		"> > level 1\n"

+		"> \n"

+		"> back normal text"))

+		g_test_fail ();

+

+	g_free (to_insert);

+	g_free (converted);

+}

+

 void

 test_add_html_editor_bug_tests (void)

 {

@@ -1234,4 +1348,5 @@ test_add_html_editor_bug_tests (void)

 	test_utils_add_test ("/bug/780088", test_bug_780088);

 	test_utils_add_test ("/bug/788829", test_bug_788829);

 	test_utils_add_test ("/bug/750636", test_bug_750636);

+	test_utils_add_test ("/issue/86", test_issue_86);

 }

diff -up evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c.composer-mangled-quotation evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c

--- evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c.composer-mangled-quotation	2018-07-30 15:37:05.000000000 +0200

+++ evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c	2018-11-09 13:29:06.551168971 +0100

@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPag

 			WEBKIT_DOM_NODE (content_wrapper),

 			WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)),

 			NULL);

-

 	if (!cite_body) {

 		if (!empty) {

 			WebKitDOMNode *child;

@@ -8754,6 +8753,133 @@ adapt_to_editor_dom_changes (WebKitDOMDo

 	g_clear_object (&collection);

 }

+static void

+traverse_nodes_to_split_pre (WebKitDOMDocument *document,

+			     WebKitDOMNode *node,

+			     WebKitDOMNode *new_parent, /* can be NULL, then prepend to out_new_nodes */

+			     gboolean is_in_pre,

+			     GSList **out_new_nodes) /* WebKitDOMNode * */

+{

+	if (is_in_pre && WEBKIT_DOM_IS_TEXT (node)) {

+		gchar *text;

+

+		text = webkit_dom_text_get_whole_text (WEBKIT_DOM_TEXT (node));

+		if (text) {

+			WebKitDOMElement *pre;

+			gint ii;

+			gchar **strv;

+

+			strv = g_strsplit (text, "\n", -1);

+

+			for (ii = 0; strv && strv[ii]; ii++) {

+				if (*(strv[ii])) {

+					gint len = strlen (strv[ii]);

+

+					if (strv[ii][len - 1] == '\r') {

+						strv[ii][len - 1] = '\0';

+					}

+				}

+

+				/* 
 is shown as a block, thus adding a new line at the end behaves like two 
-s */

+				if (!*(strv[ii]) && !strv[ii + 1])

+					break;

+

+				pre = webkit_dom_document_create_element (document, "pre", NULL);

+

+				if (*(strv[ii])) {

+					webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre), strv[ii], NULL);

+				} else {

+					WebKitDOMElement *br;

+

+					br = webkit_dom_document_create_element (document, "br", NULL);

+					webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);

+				}

+

+				if (new_parent)

+					webkit_dom_node_append_child (new_parent, WEBKIT_DOM_NODE (pre), NULL);

+				else

+					*out_new_nodes = g_slist_prepend (*out_new_nodes, pre);

+			}

+

+			g_strfreev (strv);

+		}

+

+		g_free (text);

+	} else if (WEBKIT_DOM_IS_HTML_PRE_ELEMENT (node)) {

+		is_in_pre = TRUE;

+	} else {

+		WebKitDOMNode *nd;

+		GError *error = NULL;

+

+		nd = webkit_dom_node_clone_node_with_error (node, FALSE, &error);

+		if (nd) {

+			if (new_parent)

+				webkit_dom_node_append_child (new_parent, nd, NULL);

+			else

+				*out_new_nodes = g_slist_prepend (*out_new_nodes, nd);

+

+			new_parent = nd;

+		} else {

+			g_warning ("%s: Failed to clone node %s: %s\n", G_STRFUNC, G_OBJECT_TYPE_NAME (node), error ? error->message : "Unknown error");

+		}

+	}

+

+	for (node = webkit_dom_node_get_first_child (node);

+	     node;

+	     node = webkit_dom_node_get_next_sibling (node)) {

+		traverse_nodes_to_split_pre (document, node, new_parent, is_in_pre, out_new_nodes);

+	}

+}

+

+static void

+maybe_split_pre_paragraphs (WebKitDOMDocument *document)

+{

+	WebKitDOMHTMLElement *body;

+	WebKitDOMNodeList *list;

+

+	body = webkit_dom_document_get_body (document);

+	if (!body)

+		return;

+

+	list = webkit_dom_document_query_selector_all (document, "pre", NULL);

+	if (webkit_dom_node_list_get_length (list)) {

+		WebKitDOMNode *body_node, *node, *current;

+		GSList *new_nodes = NULL, *to_remove = NULL, *link;

+

+		g_clear_object (&list);

+

+		body_node = WEBKIT_DOM_NODE (body);

+		webkit_dom_node_normalize (body_node);

+

+		for (current = webkit_dom_node_get_first_child (body_node);

+		     current;

+		     current = webkit_dom_node_get_next_sibling (current)) {

+			traverse_nodes_to_split_pre (document, current, NULL, FALSE, &new_nodes);

+			to_remove = g_slist_prepend (to_remove, current);

+		}

+

+		for (link = to_remove; link; link = g_slist_next (link)) {

+			node = link->data;

+

+			webkit_dom_node_remove_child (body_node, node, NULL);

+		}

+

+		/* They are in reverse order, thus reverse it */

+		new_nodes = g_slist_reverse (new_nodes);

+

+		for (link = new_nodes; link; link = g_slist_next (link)) {

+			node = link->data;

+

+			webkit_dom_node_append_child (body_node, node, NULL);

+		}

+

+		g_slist_free (to_remove);

+		g_slist_free (new_nodes);

+	}

+

+	g_clear_object (&list);

+}

+

 void

 e_editor_dom_process_content_after_load (EEditorPage *editor_page)

 {

@@ -8803,60 +8929,8 @@ e_editor_dom_process_content_after_load

 		}

 		goto out;

-	} else {

-		WebKitDOMNodeList *list;

-		gulong ii;

-

-		list = webkit_dom_document_query_selector_all (document, "pre", NULL);

-		for (ii = webkit_dom_node_list_get_length (list); ii--;) {

-			WebKitDOMNode *node = webkit_dom_node_list_item (list, ii), *parent;

-			WebKitDOMElement *element;

-			gchar *inner_html;

-

-			element = WEBKIT_DOM_ELEMENT (node);

-			parent = webkit_dom_node_get_parent_node (node);

-			inner_html = webkit_dom_element_get_inner_html (element);

-

-			if (inner_html && *inner_html) {

-				gchar **strv;

-

-				strv = g_strsplit (inner_html, "\n", -1);

-				if (strv && strv[0] && strv[1]) {

-					WebKitDOMElement *pre;

-					gint jj;

-

-					for (jj = 0; strv[jj]; jj++) {

-						pre = webkit_dom_document_create_element (document, "pre", NULL);

-						if (*(strv[jj])) {

-							gint len = strlen (strv[jj]);

-

-							if (strv[jj][len - 1] == '\r') {

-								strv[jj][len - 1] = '\0';

-							}

-						}

-

-						if (*(strv[jj])) {

-							webkit_dom_html_element_set_inner_html (WEBKIT_DOM_HTML_ELEMENT (pre), strv[jj], NULL);

-						} else {

-							WebKitDOMElement *br;

-

-							br = webkit_dom_document_create_element (document, "br", NULL);

-							webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);

-						}

-

-						webkit_dom_node_insert_before (parent, WEBKIT_DOM_NODE (pre), node, NULL);

-					}

-

-					remove_node (node);

-				}

-

-				g_strfreev (strv);

-			}

-

-			g_free (inner_html);

-		}

-

-		g_clear_object (&list);

+	} else if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) {

+		maybe_split_pre_paragraphs (document);

 	}

 	adapt_to_editor_dom_changes (document);