diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
index 95ce97529..afdb8963c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptData.java
@@ -61,6 +61,11 @@ public abstract class PgpSignEncryptData implements Parcelable {
     public abstract boolean isAddBackupHeader();
     public abstract boolean isHiddenRecipients();
 
+    @Nullable
+    public abstract String getPassphraseFormat();
+    @Nullable
+    public abstract String getPassphraseBegin();
+
     public static Builder builder() {
         return new AutoValue_PgpSignEncryptData.Builder()
                 .setSignatureMasterKeyId(Constants.key.none)
@@ -102,6 +107,9 @@ public abstract class PgpSignEncryptData implements Parcelable {
             setAllowedSigningKeyIds(Collections.unmodifiableList(new ArrayList<>(allowedSigningKeyIds)));
             return this;
         }
+
+        public abstract Builder setPassphraseFormat(String passphraseFormat);
+        public abstract Builder setPassphraseBegin(String passphraseBegin);
     }
 }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
index 96c614dd6..e9ac655f6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
@@ -206,6 +206,14 @@ public class PgpSignEncryptOperation extends BaseOperation<PgpSignEncryptInputPa
             if (data.isAddBackupHeader()) {
                 armorOut.setHeader("BackupVersion", "2");
             }
+            String passphraseFormat = data.getPassphraseFormat();
+            if (passphraseFormat != null) {
+                armorOut.setHeader("Passphrase-Format", passphraseFormat);
+            }
+            String passphraseBegin = data.getPassphraseBegin();
+            if (passphraseBegin != null) {
+                armorOut.setHeader("Passphrase-Begin", passphraseBegin);
+            }
             out = armorOut;
         } else {
             out = outputStream;