diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
index 7d2139316..83e07b640 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -649,6 +649,9 @@ public class EncryptFilesFragment
 
             data.setEncryptionMasterKeyIds(encryptionKeyIds);
             data.setSignatureMasterKeyId(signingKeyId);
+            if (signingKeyId != Constants.key.none) {
+                data.setAdditionalEncryptId(signingKeyId);
+            }
         } else {
             Passphrase passphrase = modeFragment.getSymmetricPassphrase();
             if (passphrase == null) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
index c2f8fa162..20be0acf3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
@@ -264,6 +264,9 @@ public class EncryptTextFragment
 
             data.setEncryptionMasterKeyIds(encryptionKeyIds);
             data.setSignatureMasterKeyId(signingKeyId);
+            if (signingKeyId != Constants.key.none) {
+                data.setAdditionalEncryptId(signingKeyId);
+            }
         } else {
             Passphrase passphrase = modeFragment.getSymmetricPassphrase();
             if (passphrase == null) {