[evolution] Bug 742955 - Missing text in a reply

[Tomas Popela <tpopela src gnome org>]

commit 22fdfe1ba03be3280685e797e4d66c6e5eb528af
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Jan 15 15:09:59 2015 +0100

    Bug 742955 - Missing text in a reply
    
    In some cases we have to append the existing paragraph to the body
    before appending the new one.

 e-util/e-html-editor-view.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 4f92449..dfe6678 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -4269,6 +4269,9 @@ parse_html_into_paragraphs (EHTMLEditorView *view,
                        }
 
                        if (g_strcmp0 (rest_to_insert, UNICODE_ZERO_WIDTH_SPACE) == 0) {
+                               if (paragraph)
+                                       append_new_paragraph (blockquote, &paragraph);
+
                                paragraph = create_and_append_new_paragraph (
                                        selection, document, blockquote, block, "<br>");
                        } else if (preserve_block) {
@@ -4299,9 +4302,13 @@ parse_html_into_paragraphs (EHTMLEditorView *view,
 
                                g_free (html);
                                g_free (new_content);
-                       } else
+                       } else {
+                               if (paragraph)
+                                       append_new_paragraph (blockquote, &paragraph);
+
                                paragraph = create_and_append_new_paragraph (
                                        selection, document, blockquote, block, rest_to_insert);
+                       }
 
                        if (rest_to_insert && *rest_to_insert && preserve_block && paragraph) {
                                glong length = 0;