[evolution-data-server/gnome-3-38] CamelMimeFilterToHTML: Change how empty <div> is recognized

[Milan Crha <mcrha src gnome org>]

commit ccbda792dda2fb2b3be249f86018c2ce5e5f3202
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 6 17:05:47 2021 +0100

    CamelMimeFilterToHTML: Change how empty <div> is recognized
    
    The new composer cannot have an empty <div>, it should be with
    at least <br> in it.

 src/camel/camel-mime-filter-tohtml.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/camel/camel-mime-filter-tohtml.c b/src/camel/camel-mime-filter-tohtml.c
index 8893ee1d7..fff6294b3 100644
--- a/src/camel/camel-mime-filter-tohtml.c
+++ b/src/camel/camel-mime-filter-tohtml.c
@@ -504,7 +504,7 @@ html_convert (CamelMimeFilter *mime_filter,
                        }
 
                        if (priv->div_open) {
-                               if (inptr == start && *start != '\r' && *start != '\n' && !(priv->flags & 
CAMEL_MIME_FILTER_TOHTML_CONVERT_NL)) {
+                               if (inptr == start && ((*start != '\r' && *start != '\n') || !(priv->flags & 
CAMEL_MIME_FILTER_TOHTML_CONVERT_NL))) {
                                        outptr = check_size (mime_filter, outptr, &outend, 5);
                                        outptr = g_stpcpy (outptr, "<br>");
                                }