diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 9861aa0f0b..c833be5f16 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -55,7 +55,6 @@ import android.os.Handler;
 import android.os.LocaleList;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
-import android.provider.OpenableColumns;
 import android.text.Html;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -655,7 +654,9 @@ public class FragmentCompose extends FragmentBase {
         tvNoInternetAttachments.setVisibility(View.GONE);
         tvUnusedInlineImages.setVisibility(View.GONE);
 
-        pgpService = new OpenPgpServiceConnection(getContext(), "org.sufficientlysecure.keychain");
+        pgpService = new OpenPgpServiceConnection(
+                getContext(),
+                Helper.getOpenKeychainPackage(getContext()));
         pgpService.bindToService();
 
         return view;
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0a028275da..86ea5b4a05 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1046,7 +1046,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             }
         });
 
-        pgpService = new OpenPgpServiceConnection(getContext(), "org.sufficientlysecure.keychain");
+        pgpService = new OpenPgpServiceConnection(
+                getContext(),
+                Helper.getOpenKeychainPackage(getContext()));
         pgpService.bindToService();
 
         LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 95cc4daba0..20c1f637e3 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -892,6 +892,10 @@ public class Helper {
         prefs.edit().remove("last_authentication").apply();
     }
 
+    static String getOpenKeychainPackage(Context context) {
+        return "org.sufficientlysecure.keychain";
+    }
+
     // Miscellaneous
 
     static <T> List<List<T>> chunkList(List<T> list, int size) {