diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
index e998bd4e..4bf3d4c4 100644
--- a/src/client/util/util-webkit.vala
+++ b/src/client/util/util-webkit.vala
@@ -339,7 +339,10 @@ public string html_to_flowed_text(WebKit.DOM.HTMLElement el) {
     string[] lines = doctext.split("\n");
     GLib.StringBuilder flowed = new GLib.StringBuilder.sized(doctext.length);
     foreach (string line in lines) {
-        line = line.chomp();
+        // Strip trailing whitespace, so it doesn't look like a flowed line.  But the
+        // signature separator "-- " is special, so leave that alone.
+        if (line != "-- ")
+            line = line.chomp();
         int quote_level = 0;
         while (line[quote_level] == Geary.RFC822.Utils.QUOTE_MARKER)
             quote_level += 1;