diff --git a/.gitignore b/.gitignore
index d7de872..b53a4ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,3 +151,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.29.90.tar.xz
/evolution-3.29.91.tar.xz
/evolution-3.29.92.tar.xz
+/evolution-3.30.0.tar.xz
diff --git a/evolution-3.30.0-evo-issue-86.patch b/evolution-3.30.0-evo-issue-86.patch
new file mode 100644
index 0000000..261cb02
--- /dev/null
+++ b/evolution-3.30.0-evo-issue-86.patch
@@ -0,0 +1,340 @@
+diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
+index ea3bf6f987..f89565f7e2 100644
+--- a/src/e-util/test-html-editor-units-bugs.c
++++ b/src/e-util/test-html-editor-units-bugs.c
+@@ -1208,6 +1208,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)
+ {
+@@ -1237,4 +1351,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 --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+index bdef1ccf57..71d80ae5a7 100644
+--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
++++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPage *editor_page,
+ WEBKIT_DOM_NODE (content_wrapper),
+ WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)),
+ NULL);
+-
+ if (!cite_body) {
+ if (!empty) {
+ WebKitDOMNode *child;
+@@ -8804,6 +8803,133 @@ e_editor_dom_adapt_to_editor_dom_changes (EEditorPage *editor_page)
+ 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)
+ {
+@@ -8853,60 +8979,8 @@ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
+ }
+
+ 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);
+ }
+
+ e_editor_dom_adapt_to_editor_dom_changes (editor_page);
diff --git a/evolution.spec b/evolution.spec
index bba697e..8f03e99 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,16 +28,18 @@
### Abstract ###
Name: evolution
-Version: 3.29.92
+Version: 3.30.0
Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
### Patches ###
+Patch01: evolution-3.30.0-evo-issue-86.patch
+
Obsoletes: anjal <= %{last_anjal_version}
Obsoletes: libgal2 <= %{last_libgal2_version}
Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -211,6 +213,8 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n evolution-%{version}
+%patch01 -p1 -b .evo-issue-86
+
# Remove the welcome email from Novell
for inbox in src/mail/default/*/Inbox; do
echo -n "" > $inbox
@@ -502,6 +506,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
%{_datadir}/installed-tests
%changelog
+* Mon Sep 03 2018 Milan Crha - 3.30.0-1
+- Update to 3.30.0
+- Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels)
+
* Mon Aug 27 2018 Milan Crha - 3.29.92-1
- Update to 3.29.92
diff --git a/sources b/sources
index 8357f53..6ef8d59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.29.92.tar.xz) = b667124b25261f875ad066445a103ad9d62602b1c25bee611b342dcd12175f19fecf7021739e5161afd579a5960321ebece3cfb06b409db2e304c88ab26a5032
+SHA512 (evolution-3.30.0.tar.xz) = 15a28dc4cd3b4a194deadd7bb205e9942f193f8f5894e2cdd83e71404535cd9c43223e38d59eaa5dc9cdc977c057ee4f155df397e56079daa8432a6414010a01