[evolution] EHTMLEditorView - Decode the HTML encoded string only when ampersand is presented

[Tomas Popela <tpopela src gnome org>]

commit 7740ae2cb89ce5b3b897135a090a97b7148eab78
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Oct 31 12:17:56 2014 +0100

    EHTMLEditorView - Decode the HTML encoded string only when ampersand is presented

 e-util/e-html-editor-view.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 0929b60..551da02 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -4229,7 +4229,10 @@ parse_html_into_paragraphs (EHTMLEditorView *view,
                        if (rest_to_insert && *rest_to_insert && prevent_block && paragraph) {
                                glong length = 0;
 
-                               length = get_decoded_line_length (document, rest);
+                               if (strstr (rest, "&"))
+                                       length = get_decoded_line_length (document, rest);
+                               else
+                                       length = g_utf8_strlen (rest, -1);
 
                                /* End the block if there is line with less that 62 characters. */
                                /* The shorter line can also mean that there is a long word on next