diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 3d51fed74..cf3275e1c 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -913,12 +913,14 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         if (!isDraft && !mQuotedTextMode.equals(QuotedTextMode.SHOW)) {
             discardQuotedText = true;
         }
+        
 
         if (discardQuotedText) {
             if (!isDraft) {
                 text = appendSignature(text);
             }
 
+            text = HtmlConverter.textToHtmlFragment(text);
             // Build the body.
             TextBody body = new TextBody(text);
             body.setComposedMessageLength(text.length());