diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index d82c68316..070239a80 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -434,7 +434,13 @@ public class PgpSignEncrypt {
             }
 
             PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
-            pOut = literalGen.open(bcpgOut, PGPLiteralData.BINARY, mOriginalFilename, new Date(),
+            char literalDataFormatTag;
+            if (mCleartextInput) {
+                literalDataFormatTag = PGPLiteralData.UTF8;
+            } else {
+                literalDataFormatTag = PGPLiteralData.BINARY;
+            }
+            pOut = literalGen.open(bcpgOut, literalDataFormatTag, mOriginalFilename, new Date(),
                     new byte[1 << 16]);
 
             long alreadyWritten = 0;
diff --git a/settings.gradle b/settings.gradle
index 997dcc838..3e232d229 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,5 +14,4 @@ include ':extern:minidns'
 include ':extern:KeybaseLib:Lib'
 include ':extern:TokenAutoComplete:library'
 include ':extern:openpgp-card-nfc-lib:library'
-include ':extern:safeslinger-exchange'
-include ':OpenKeychain-Test'
+include ':extern:safeslinger-exchange'
\ No newline at end of file