diff --git a/tests.py b/tests.py
index db321f23c..e4dace257 100644
--- a/tests.py
+++ b/tests.py
@@ -3293,6 +3293,13 @@ def testMarkdownToHtml():
     assert markdownToHtml(markdown) == 'This is a quotation:<br>' + \
         '<blockquote><i>Some quote or other</i></blockquote>'
 
+    markdown = 'This is a multi-line quotation:\n' + \
+        '> The first line\n' + \
+        '> The second line'
+    assert markdownToHtml(markdown) == \
+        'This is a multi-line quotation:<br>' + \
+        '<blockquote><i>The first line The second line</i></blockquote>'
+
     markdown = 'This is **bold**'
     assert markdownToHtml(markdown) == 'This is <b>bold</b>'
 
diff --git a/webapp_utils.py b/webapp_utils.py
index 29c965100..7a3fe6b1d 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -73,16 +73,26 @@ def _markdownReplaceQuotes(markdown: str) -> str:
         return markdown
     lines = markdown.split('\n')
     result = ''
+    prevQuoteLine = None
     for line in lines:
         if '> ' not in line:
             result += line + '\n'
+            prevQuoteLine = None
             continue
         lineStr = line.strip()
         if not lineStr.startswith('> '):
             result += line + '\n'
+            prevQuoteLine = None
             continue
         lineStr = lineStr.replace('> ', '', 1).strip()
-        result += '<blockquote><i>' + lineStr + '</i></blockquote>\n'
+        if prevQuoteLine:
+            newPrevLine = prevQuoteLine.replace('</i></blockquote>\n', '')
+            result = result.replace(prevQuoteLine, newPrevLine) + ' '
+            lineStr += '</i></blockquote>\n'
+        else:
+            lineStr = '<blockquote><i>' + lineStr + '</i></blockquote>\n'
+        result += lineStr
+        prevQuoteLine = lineStr
 
     if result.endswith('\n') and \
        not markdown.endswith('\n'):