diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java b/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java
index dc39a268f..a568fb65f 100644
--- a/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java
+++ b/tests-on-jvm/src/com/fsck/k9/mail/internet/TextBodyBuilderTest.java
@@ -29,13 +29,10 @@ class TestingTextBodyBuilder extends TextBodyBuilder {
         else {
             this.setIncludeQuotedText(false);
         }
-        if (!isDraft) {
-            this.setAppendSignature(true);
-        }
-        else {
-            this.setAppendSignature(false);
-        }
-        this.setDraft(isDraft);
+
+        this.setAppendSignature(!isDraft);
+        this.setInsertSeparator(!isDraft);
+
         this.setSignatureBeforeQuotedText(signatureBeforeQuotedText);
 
         if (quoteStyle == QuoteStyle.PREFIX && replyAfterQuote) {