# HG changeset patch
# User Sergey Kitov <sergey.kitov@open-xchange.com>
# Date 1520951804 -7200
# Node ID 0ebd5557ce43a54b3242d9fd7404d0d316de237a
# Parent  08a348bc475b16f913624dd5be7251c264ee10c8
lib-mail: html2text: do not parse entity when quote_level > 0.

&entities inside blockquotes are added to text, while other text is
not, this leads to strange results.

diff -r 08a348bc475b -r 0ebd5557ce43 src/lib-mail/mail-html2text.c
--- a/src/lib-mail/mail-html2text.c	Fri Apr 06 15:48:02 2018 +0300
+++ b/src/lib-mail/mail-html2text.c	Tue Mar 13 16:36:44 2018 +0200
@@ -191,13 +191,15 @@
 				if (ret == 0)
 					return i;
 				i += ret - 1;
-			} else if (c == '&') {
-				ret = parse_entity(data+i+1, size-i-1, output);
-				if (ret == 0)
-					return i;
-				i += ret - 1;
 			} else if (ht->quote_level == 0) {
-				buffer_append_c(output, c);
+				if (c == '&') {
+					ret = parse_entity(data+i+1, size-i-1, output);
+					if (ret == 0)
+						return i;
+					i += ret - 1;
+				} else {
+					buffer_append_c(output, c);
+				}
 			}
 			break;
 		case HTML_STATE_TAG: