From 488ef5b34d136765d5ed0203e4e6f267da3370ca Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 14 Sep 2020 11:25:12 +0100
Subject: [PATCH] Extra blockquote check

---
 content.py |  8 +++++++-
 tests.py   | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/content.py b/content.py
index 3db21aa92..8adf8adaf 100644
--- a/content.py
+++ b/content.py
@@ -26,9 +26,15 @@ def htmlReplaceEmailQuote(content: str) -> str:
         if not lineStr:
             continue
         if '>&gt; ' not in lineStr:
-            newContent += '<p>' + lineStr + '</p>'
+            if lineStr.startswith('&gt; '):
+                lineStr = lineStr.replace('&gt; ', '<blockquote>')
+                lineStr = lineStr.replace('&gt;', '<br>')
+                newContent += '<p>' + lineStr + '</blockquote></p>'
+            else:
+                newContent += '<p>' + lineStr + '</p>'
         else:
             lineStr = lineStr.replace('>&gt; ', '><blockquote>')
+            lineStr = lineStr.replace('&gt;', '<br>')
             newContent += '<p>' + lineStr + '</blockquote></p>'
     return newContent
 
diff --git a/tests.py b/tests.py
index 110c99be5..95fd86f6b 100644
--- a/tests.py
+++ b/tests.py
@@ -2149,6 +2149,16 @@ def testReplaceEmailQuote():
         print('Expect: ' + expectedStr)
     assert resultStr == expectedStr
 
+    testStr = "<p>Some text:</p><p>&gt; first line-&gt;second line</p>" + \
+        "<p>Some question?</p>"
+    expectedStr = "<p>Some text:</p><p><blockquote>first line-<br>" + \
+        "second line</blockquote></p><p>Some question?</p>"
+    resultStr = htmlReplaceEmailQuote(testStr)
+    if resultStr != expectedStr:
+        print('Result: ' + resultStr)
+        print('Expect: ' + expectedStr)
+    assert resultStr == expectedStr
+
 
 def runAllTests():
     print('Running tests...')