From 99991e665170ad95ea689dd0bbdb6f3c910737e0 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 18 Sep 2014 19:15:53 +0200
Subject: [PATCH 1/4] Remove option to select (legacy) APG as crypto provider

---
 .../openpgp/util/OpenPgpListPreference.java   | 24 +++-------
 res/xml/account_settings_preferences.xml      | 14 ------
 .../k9/activity/setup/AccountSettings.java    | 45 +++----------------
 3 files changed, 10 insertions(+), 73 deletions(-)

diff --git a/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
index 54c5b1348..3c21eaff0 100644
--- a/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
+++ b/plugins/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
@@ -16,6 +16,9 @@
 
 package org.openintents.openpgp.util;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -31,10 +34,8 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.TextView;
-import org.openintents.openpgp.R;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.openintents.openpgp.R;
 
 /**
  * Does not extend ListPreference, but is very similar to it!
@@ -46,7 +47,6 @@ public class OpenPgpListPreference extends DialogPreference {
     private static final Intent MARKET_INTENT = new Intent(Intent.ACTION_VIEW, Uri.parse(
             String.format(MARKET_INTENT_URI_BASE, OPENKEYCHAIN_PACKAGE)));
 
-    private ArrayList<OpenPgpProviderEntry> mLegacyList = new ArrayList<OpenPgpProviderEntry>();
     private ArrayList<OpenPgpProviderEntry> mList = new ArrayList<OpenPgpProviderEntry>();
 
     private String mSelectedPackage;
@@ -59,17 +59,6 @@ public class OpenPgpListPreference extends DialogPreference {
         this(context, null);
     }
 
-    /**
-     * Public method to add new entries for legacy applications
-     *
-     * @param packageName
-     * @param simpleName
-     * @param icon
-     */
-    public void addLegacyProvider(int position, String packageName, String simpleName, Drawable icon) {
-        mLegacyList.add(position, new OpenPgpProviderEntry(packageName, simpleName, icon));
-    }
-
     @Override
     protected void onPrepareDialogBuilder(Builder builder) {
         mList.clear();
@@ -78,10 +67,7 @@ public class OpenPgpListPreference extends DialogPreference {
         mList.add(0, new OpenPgpProviderEntry("",
                 getContext().getString(R.string.openpgp_list_preference_none),
                 getContext().getResources().getDrawable(R.drawable.ic_action_cancel_launchersize_light)));
-        
-        // add all additional (legacy) providers
-        mList.addAll(mLegacyList);
-        
+
         // search for OpenPGP providers...
         ArrayList<OpenPgpProviderEntry> providerList = new ArrayList<OpenPgpProviderEntry>();
         Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT);
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 6c65658ed..a0c5f4a28 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -471,20 +471,6 @@
             android:key="crypto_app"
             android:title="@string/account_settings_crypto_app" />
 
-        <CheckBoxPreference
-            android:persistent="false"
-            android:key="crypto_auto_signature"
-            android:title="@string/account_settings_crypto_auto_signature"
-            android:summary="@string/account_settings_crypto_auto_signature_summary"
-            android:dependency="crypto_app"/>
-
-        <CheckBoxPreference
-            android:persistent="false"
-            android:key="crypto_auto_encrypt"
-            android:title="@string/account_settings_crypto_auto_encrypt"
-            android:summary="@string/account_settings_crypto_auto_encrypt_summary"
-            android:dependency="crypto_app"/>
-
     </PreferenceScreen>
 
 </PreferenceScreen>
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 9c27ae4de..32adbdd77 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -1,16 +1,12 @@
 
 package com.fsck.k9.activity.setup;
 
-import android.app.Dialog;
-
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.openintents.openpgp.util.OpenPgpListPreference;
-import org.openintents.openpgp.util.OpenPgpUtils;
-
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -38,13 +34,15 @@ import com.fsck.k9.activity.ChooseIdentity;
 import com.fsck.k9.activity.ColorPickerDialog;
 import com.fsck.k9.activity.K9PreferenceActivity;
 import com.fsck.k9.activity.ManageIdentities;
-import com.fsck.k9.crypto.Apg;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Store;
 import com.fsck.k9.mail.store.LocalStore.LocalFolder;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.service.MailService;
 
+import org.openintents.openpgp.util.OpenPgpListPreference;
+import org.openintents.openpgp.util.OpenPgpUtils;
+
 
 public class AccountSettings extends K9PreferenceActivity {
     private static final String EXTRA_ACCOUNT = "account";
@@ -107,8 +105,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private static final String PREFERENCE_SYNC_REMOTE_DELETIONS = "account_sync_remote_deletetions";
     private static final String PREFERENCE_CRYPTO = "crypto";
     private static final String PREFERENCE_CRYPTO_APP = "crypto_app";
-    private static final String PREFERENCE_CRYPTO_AUTO_SIGNATURE = "crypto_auto_signature";
-    private static final String PREFERENCE_CRYPTO_AUTO_ENCRYPT = "crypto_auto_encrypt";
     private static final String PREFERENCE_CLOUD_SEARCH_ENABLED = "remote_search_enabled";
     private static final String PREFERENCE_REMOTE_SEARCH_NUM_RESULTS = "account_remote_search_num_results";
     private static final String PREFERENCE_REMOTE_SEARCH_FULL_TEXT = "account_remote_search_full_text";
@@ -174,8 +170,6 @@ public class AccountSettings extends K9PreferenceActivity {
     private ListPreference mMaxPushFolders;
     private boolean mHasCrypto = false;
     private OpenPgpListPreference mCryptoApp;
-    private CheckBoxPreference mCryptoAutoSignature;
-    private CheckBoxPreference mCryptoAutoEncrypt;
 
     private PreferenceScreen mSearchScreen;
     private CheckBoxPreference mCloudSearchEnabled;
@@ -686,15 +680,10 @@ public class AccountSettings extends K9PreferenceActivity {
             }
         });
 
-        mHasCrypto = (new Apg().isAvailable(this) || OpenPgpUtils.isAvailable(this));
+        mHasCrypto = OpenPgpUtils.isAvailable(this);
         if (mHasCrypto) {
             mCryptoApp = (OpenPgpListPreference) findPreference(PREFERENCE_CRYPTO_APP);
 
-            // add "apg"
-            if (new Apg().isAvailable(this)) {
-                mCryptoApp.addLegacyProvider(0, "apg", "APG", null);
-            }
-            
             mCryptoApp.setValue(String.valueOf(mAccount.getCryptoApp()));
             mCryptoApp.setSummary(mCryptoApp.getEntry());
             mCryptoApp.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@@ -702,21 +691,9 @@ public class AccountSettings extends K9PreferenceActivity {
                     String value = newValue.toString();
                     mCryptoApp.setSummary(mCryptoApp.getEntryByValue(value));
                     mCryptoApp.setValue(value);
-                    handleCryptoAppDependencies();
-                    if (Apg.NAME.equals(value)) {
-                        Apg.createInstance(null).test(AccountSettings.this);
-                    }
                     return false;
                 }
             });
-
-            mCryptoAutoSignature = (CheckBoxPreference) findPreference(PREFERENCE_CRYPTO_AUTO_SIGNATURE);
-            mCryptoAutoSignature.setChecked(mAccount.getCryptoAutoSignature());
-
-            mCryptoAutoEncrypt = (CheckBoxPreference) findPreference(PREFERENCE_CRYPTO_AUTO_ENCRYPT);
-            mCryptoAutoEncrypt.setChecked(mAccount.isCryptoAutoEncrypt());
-
-            handleCryptoAppDependencies();
         } else {
             final Preference mCryptoMenu = findPreference(PREFERENCE_CRYPTO);
             mCryptoMenu.setEnabled(false);
@@ -744,16 +721,6 @@ public class AccountSettings extends K9PreferenceActivity {
         listPreference.setEntries(newEntries);
     }
 
-    private void handleCryptoAppDependencies() {
-        if ("apg".equals(mCryptoApp.getValue())) {
-            mCryptoAutoSignature.setEnabled(true);
-            mCryptoAutoEncrypt.setEnabled(true);
-        } else {
-            mCryptoAutoSignature.setEnabled(false);
-            mCryptoAutoEncrypt.setEnabled(false);
-        }
-    }
-
     private void saveSettings() {
         if (mAccountDefault.isChecked()) {
             Preferences.getPreferences(this).setDefaultAccount(mAccount);
@@ -793,8 +760,6 @@ public class AccountSettings extends K9PreferenceActivity {
         mAccount.setLocalStorageProviderId(mLocalStorageProvider.getValue());
         if (mHasCrypto) {
             mAccount.setCryptoApp(mCryptoApp.getValue());
-            mAccount.setCryptoAutoSignature(mCryptoAutoSignature.isChecked());
-            mAccount.setCryptoAutoEncrypt(mCryptoAutoEncrypt.isChecked());
         }
 
         // In webdav account we use the exact folder name also for inbox,

From 352fb8fd2548944dde0aeaf4162867c9e0ce1156 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 18 Sep 2014 19:45:25 +0200
Subject: [PATCH 2/4] Remove legacy APG interface

---
 res/layout/message_view_crypto_layout.xml     |  58 --
 res/layout/message_view_header.xml            |   2 -
 res/values/strings.xml                        |   1 +
 src/com/fsck/k9/Account.java                  |  42 +-
 src/com/fsck/k9/activity/MessageCompose.java  | 132 +---
 .../k9/activity/setup/AccountSettings.java    |   2 +-
 src/com/fsck/k9/crypto/Apg.java               | 588 ------------------
 src/com/fsck/k9/crypto/CryptoProvider.java    |  48 --
 src/com/fsck/k9/crypto/None.java              | 103 ---
 .../fsck/k9/fragment/MessageViewFragment.java |  21 +-
 .../fsck/k9/preferences/AccountSettings.java  |  10 +-
 src/com/fsck/k9/preferences/Settings.java     |   2 +-
 src/com/fsck/k9/view/MessageCryptoView.java   | 140 -----
 src/com/fsck/k9/view/SingleMessageView.java   |  12 +-
 14 files changed, 15 insertions(+), 1146 deletions(-)
 delete mode 100644 res/layout/message_view_crypto_layout.xml
 delete mode 100644 src/com/fsck/k9/crypto/Apg.java
 delete mode 100644 src/com/fsck/k9/crypto/CryptoProvider.java
 delete mode 100644 src/com/fsck/k9/crypto/None.java
 delete mode 100644 src/com/fsck/k9/view/MessageCryptoView.java

diff --git a/res/layout/message_view_crypto_layout.xml b/res/layout/message_view_crypto_layout.xml
deleted file mode 100644
index a5bda33a5..000000000
--- a/res/layout/message_view_crypto_layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.fsck.k9.view.MessageCryptoView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_decrypt"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:visibility="gone">
-
-    <LinearLayout
-        android:id="@+id/crypto_signature"
-        android:orientation="horizontal"
-        android:layout_height="wrap_content"
-        android:layout_width="0dip"
-        android:layout_weight="2"
-        android:gravity="center_vertical">
-        <RelativeLayout
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content">
-            <ImageView
-                android:id="@+id/ic_crypto_signature"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/signed_large"/>
-            <ImageView
-                android:id="@+id/ic_crypto_signature_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/overlay_error"/>
-        </RelativeLayout>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:paddingLeft="5dip">
-            <TextView
-                android:id="@+id/userId"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:ellipsize="end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"/>
-            <TextView
-                android:id="@+id/userIdRest"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:ellipsize="end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"/>
-        </LinearLayout>
-    </LinearLayout>
-    <Button
-        android:text="@string/btn_decrypt"
-        android:id="@+id/btn_decrypt"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"/>
-</com.fsck.k9.view.MessageCryptoView>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index c1a47d69e..0e838158f 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -250,8 +250,6 @@
 
     </LinearLayout>
 
-    <include layout="@layout/message_view_crypto_layout" />
-    
     <include layout="@layout/message_view_openpgp_layout"/>
 
 </com.fsck.k9.view.MessageHeader>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 32c764a1f..d7bca28b8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -569,6 +569,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_settings_crypto_auto_encrypt">Auto-encrypt</string>
     <string name="account_settings_crypto_auto_encrypt_summary">Automatically set encrypt if a public key matches a recipient.</string>
     <string name="account_settings_crypto_apg_not_installed">APG not installed</string>
+    <string name="account_settings_no_openpgp_provider_installed">No OpenPGP Provider installed</string>
 
     <string name="account_settings_mail_check_frequency_label">Folder poll frequency</string>
 
diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 54297b580..c36d3d952 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -24,8 +24,6 @@ import android.net.Uri;
 import android.util.Log;
 
 import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection;
-import com.fsck.k9.crypto.Apg;
-import com.fsck.k9.crypto.CryptoProvider;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.MessagingException;
@@ -135,6 +133,7 @@ public class Account implements BaseAccount {
 
     public static final SortType DEFAULT_SORT_TYPE = SortType.SORT_DATE;
     public static final boolean DEFAULT_SORT_ASCENDING = false;
+    public static final String NO_OPENPGP_PROVIDER = "";
 
 
     /**
@@ -206,16 +205,12 @@ public class Account implements BaseAccount {
     private boolean mStripSignature;
     private boolean mSyncRemoteDeletions;
     private String mCryptoApp;
-    private boolean mCryptoAutoSignature;
-    private boolean mCryptoAutoEncrypt;
     private boolean mMarkMessageAsReadOnView;
     private boolean mAlwaysShowCcBcc;
     private boolean mAllowRemoteSearch;
     private boolean mRemoteSearchFullText;
     private int mRemoteSearchNumResults;
 
-    private CryptoProvider mCryptoProvider = null;
-
     private ColorChip mUnreadColorChip;
     private ColorChip mReadColorChip;
 
@@ -303,9 +298,7 @@ public class Account implements BaseAccount {
         mReplyAfterQuote = DEFAULT_REPLY_AFTER_QUOTE;
         mStripSignature = DEFAULT_STRIP_SIGNATURE;
         mSyncRemoteDeletions = true;
-        mCryptoApp = Apg.NAME;
-        mCryptoAutoSignature = false;
-        mCryptoAutoEncrypt = false;
+        mCryptoApp = NO_OPENPGP_PROVIDER;
         mAllowRemoteSearch = false;
         mRemoteSearchFullText = false;
         mRemoteSearchNumResults = DEFAULT_REMOTE_SEARCH_NUM_RESULTS;
@@ -492,9 +485,7 @@ public class Account implements BaseAccount {
         mIsSignatureBeforeQuotedText = prefs.getBoolean(mUuid  + ".signatureBeforeQuotedText", false);
         identities = loadIdentities(prefs);
 
-        mCryptoApp = prefs.getString(mUuid + ".cryptoApp", Apg.NAME);
-        mCryptoAutoSignature = prefs.getBoolean(mUuid + ".cryptoAutoSignature", false);
-        mCryptoAutoEncrypt = prefs.getBoolean(mUuid + ".cryptoAutoEncrypt", false);
+        mCryptoApp = prefs.getString(mUuid + ".cryptoApp", NO_OPENPGP_PROVIDER);
         mAllowRemoteSearch = prefs.getBoolean(mUuid + ".allowRemoteSearch", false);
         mRemoteSearchFullText = prefs.getBoolean(mUuid + ".remoteSearchFullText", false);
         mRemoteSearchNumResults = prefs.getInt(mUuid + ".remoteSearchNumResults", DEFAULT_REMOTE_SEARCH_NUM_RESULTS);
@@ -756,8 +747,6 @@ public class Account implements BaseAccount {
         editor.putBoolean(mUuid + ".replyAfterQuote", mReplyAfterQuote);
         editor.putBoolean(mUuid + ".stripSignature", mStripSignature);
         editor.putString(mUuid + ".cryptoApp", mCryptoApp);
-        editor.putBoolean(mUuid + ".cryptoAutoSignature", mCryptoAutoSignature);
-        editor.putBoolean(mUuid + ".cryptoAutoEncrypt", mCryptoAutoEncrypt);
         editor.putBoolean(mUuid + ".allowRemoteSearch", mAllowRemoteSearch);
         editor.putBoolean(mUuid + ".remoteSearchFullText", mRemoteSearchFullText);
         editor.putInt(mUuid + ".remoteSearchNumResults", mRemoteSearchNumResults);
@@ -1646,24 +1635,6 @@ public class Account implements BaseAccount {
 
     public void setCryptoApp(String cryptoApp) {
         mCryptoApp = cryptoApp;
-        // invalidate the provider
-        mCryptoProvider = null;
-    }
-
-    public boolean getCryptoAutoSignature() {
-        return mCryptoAutoSignature;
-    }
-
-    public void setCryptoAutoSignature(boolean cryptoAutoSignature) {
-        mCryptoAutoSignature = cryptoAutoSignature;
-    }
-
-    public boolean isCryptoAutoEncrypt() {
-        return mCryptoAutoEncrypt;
-    }
-
-    public void setCryptoAutoEncrypt(boolean cryptoAutoEncrypt) {
-        mCryptoAutoEncrypt = cryptoAutoEncrypt;
     }
 
     public boolean allowRemoteSearch() {
@@ -1706,13 +1677,6 @@ public class Account implements BaseAccount {
         lastSelectedFolderName = folderName;
     }
 
-    public synchronized CryptoProvider getCryptoProvider() {
-        if (mCryptoProvider == null) {
-            mCryptoProvider = CryptoProvider.createInstance(getCryptoApp());
-        }
-        return mCryptoProvider;
-    }
-    
     public synchronized String getOpenPgpProvider() {
         // return null if set to "APG" or "None"
         if (getCryptoApp().equals("apg") || getCryptoApp().equals("")) {
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 9c473629a..8c1ac9182 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -82,7 +82,6 @@ import com.fsck.k9.activity.loader.AttachmentInfoLoader;
 import com.fsck.k9.activity.misc.Attachment;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
-import com.fsck.k9.crypto.CryptoProvider;
 import com.fsck.k9.crypto.OpenPgpApiHelper;
 import com.fsck.k9.crypto.PgpData;
 import com.fsck.k9.fragment.ProgressDialogFragment;
@@ -127,9 +126,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
     private static final int DIALOG_SAVE_OR_DISCARD_DRAFT_MESSAGE = 1;
     private static final int DIALOG_REFUSE_TO_SAVE_DRAFT_MARKED_ENCRYPTED = 2;
-    private static final int DIALOG_CONTINUE_WITHOUT_PUBLIC_KEY = 3;
-    private static final int DIALOG_CONFIRM_DISCARD_ON_BACK = 4;
-    private static final int DIALOG_CHOOSE_IDENTITY = 5;
+    private static final int DIALOG_CONFIRM_DISCARD_ON_BACK = 3;
+    private static final int DIALOG_CHOOSE_IDENTITY = 4;
 
     private static final long INVALID_DRAFT_ID = MessagingController.INVALID_MESSAGE_ID;
 
@@ -313,9 +311,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
     private ImageButton mAddBccFromContacts;
 
     private PgpData mPgpData = null;
-    private boolean mAutoEncrypt = false;
-    private boolean mContinueWithoutPublicKey = false;
-
     private String mOpenPgpProvider;
     private OpenPgpServiceConnection mOpenPgpServiceConnection;
 
@@ -506,7 +501,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
      * Save will attempt to replace the message in the given folder with the updated version.
      * Discard will delete the message from the given folder.
      * @param context
-     * @param message
+     * @param messageReference
      */
     public static void actionEditDraft(Context context, MessageReference messageReference) {
         Intent i = new Intent(context, MessageCompose.class);
@@ -656,17 +651,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
             @Override
             public void afterTextChanged(android.text.Editable s) {
-                final CryptoProvider crypto = mAccount.getCryptoProvider();
-                if (mAutoEncrypt && crypto.isAvailable(getApplicationContext())) {
-                    for (Address address : getRecipientAddresses()) {
-                        if (crypto.hasPublicKeyForEmail(getApplicationContext(),
-                                address.getAddress())) {
-                            mEncryptCheckbox.setChecked(true);
-                            mContinueWithoutPublicKey = false;
-                            break;
-                        }
-                    }
-                }
+                /* do nothing */
             }
         };
 
@@ -858,7 +843,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
         initializeCrypto();
 
-        final CryptoProvider crypto = mAccount.getCryptoProvider();
         mOpenPgpProvider = mAccount.getOpenPgpProvider();
         if (mOpenPgpProvider != null) {
             // New OpenPGP Provider API
@@ -878,44 +862,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
                 }
             });
 
-            if (mAccount.getCryptoAutoSignature()) {
-                // TODO: currently disabled for new openpgp providers (see AccountSettings)
-            }
             updateMessageFormat();
-            // TODO: currently disabled for new openpgp providers (see AccountSettings)
-            mAutoEncrypt = false;
-            //mAutoEncrypt = mAccount.isCryptoAutoEncrypt();
-        } else if (crypto.isAvailable(this)) {
-            mEncryptLayout.setVisibility(View.VISIBLE);
-            mCryptoSignatureCheckbox.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    CheckBox checkBox = (CheckBox) v;
-                    if (checkBox.isChecked()) {
-                        mPreventDraftSaving = true;
-                        if (!crypto.selectSecretKey(MessageCompose.this, mPgpData)) {
-                            mPreventDraftSaving = false;
-                        }
-                        checkBox.setChecked(false);
-                    } else {
-                        mPgpData.setSignatureKeyId(0);
-                        updateEncryptLayout();
-                    }
-                }
-            });
-
-            if (mAccount.getCryptoAutoSignature()) {
-                long ids[] = crypto.getSecretKeyIdsFromEmail(this, mIdentity.getEmail());
-                if (ids != null && ids.length > 0) {
-                    mPgpData.setSignatureKeyId(ids[0]);
-                    mPgpData.setSignatureUserId(crypto.getUserId(this, ids[0]));
-                } else {
-                    mPgpData.setSignatureKeyId(0);
-                    mPgpData.setSignatureUserId(null);
-                }
-            }
-            updateEncryptLayout();
-            mAutoEncrypt = mAccount.isCryptoAutoEncrypt();
         } else {
             mEncryptLayout.setVisibility(View.GONE);
         }
@@ -1108,11 +1055,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
             mCryptoSignatureUserIdRest.setText("");
 
             String userId = mPgpData.getSignatureUserId();
-            if (userId == null) {
-                userId = mAccount.getCryptoProvider().getUserId(this, mPgpData.getSignatureKeyId());
-                mPgpData.setSignatureUserId(userId);
-            }
-
             if (userId != null) {
                 String chunks[] = mPgpData.getSignatureUserId().split(" <", 2);
                 mCryptoSignatureUserId.setText(chunks[0]);
@@ -1795,8 +1737,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
     }
 
     private void performSend() {
-        final CryptoProvider crypto = mAccount.getCryptoProvider();
-
         if (mOpenPgpProvider != null) {
             // OpenPGP Provider API
 
@@ -1831,44 +1771,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
                 // encryptedData set in pgpData!
                 return;
             }
-        } else if (crypto.isAvailable(this)) {
-            // Legacy APG API
-
-            if (mEncryptCheckbox.isChecked() && !mPgpData.hasEncryptionKeys()) {
-                // key selection before encryption
-                StringBuilder emails = new StringBuilder();
-                for (Address address : getRecipientAddresses()) {
-                    if (emails.length() != 0) {
-                        emails.append(',');
-                    }
-                    emails.append(address.getAddress());
-                    if (!mContinueWithoutPublicKey &&
-                            !crypto.hasPublicKeyForEmail(this, address.getAddress())) {
-                        showDialog(DIALOG_CONTINUE_WITHOUT_PUBLIC_KEY);
-                        return;
-                    }
-                }
-                if (emails.length() != 0) {
-                    emails.append(',');
-                }
-                emails.append(mIdentity.getEmail());
-
-                mPreventDraftSaving = true;
-                if (!crypto.selectEncryptionKeys(MessageCompose.this, emails.toString(), mPgpData)) {
-                    mPreventDraftSaving = false;
-                }
-                return;
-            }
-
-            if (mPgpData.hasEncryptionKeys() || mPgpData.hasSignatureKey()) {
-                if (mPgpData.getEncryptedData() == null) {
-                    String text = buildText(false).getText();
-                    mPreventDraftSaving = true;
-                    crypto.encrypt(this, text, mPgpData);
-                    return;
-                }
-            }
-
         }
         sendMessage();
 
@@ -2053,7 +1955,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
      */
     @SuppressLint("InlinedApi")
     private void onAddAttachment2(final String mime_type) {
-        if (mAccount.getCryptoProvider().isAvailable(this) || mAccount.getOpenPgpProvider() != null) {
+        if (mAccount.getOpenPgpProvider() != null) {
             Toast.makeText(this, R.string.attachment_encryption_unsupported, Toast.LENGTH_LONG).show();
         }
         Intent i = new Intent(Intent.ACTION_GET_CONTENT);
@@ -2252,10 +2154,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
             return;
         }
 
-        if (mAccount.getCryptoProvider().onActivityResult(this, requestCode, resultCode, data, mPgpData)) {
-            return;
-        }
-
         if (resultCode != RESULT_OK) {
             return;
         }
@@ -2661,26 +2559,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
                     }
                 })
                 .create();
-            case DIALOG_CONTINUE_WITHOUT_PUBLIC_KEY:
-                return new AlertDialog.Builder(this)
-                       .setTitle(R.string.continue_without_public_key_dlg_title)
-                       .setMessage(R.string.continue_without_public_key_instructions_fmt)
-                .setPositiveButton(R.string.continue_action, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        dismissDialog(DIALOG_CONTINUE_WITHOUT_PUBLIC_KEY);
-                        mContinueWithoutPublicKey = true;
-                        onSend();
-                    }
-                })
-                .setNegativeButton(R.string.back_action, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int whichButton) {
-                        dismissDialog(DIALOG_CONTINUE_WITHOUT_PUBLIC_KEY);
-                        mContinueWithoutPublicKey = false;
-                    }
-                })
-                .create();
             case DIALOG_CONFIRM_DISCARD_ON_BACK:
                 return new AlertDialog.Builder(this)
                        .setTitle(R.string.confirm_discard_draft_message_title)
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 32adbdd77..a065561fe 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -697,7 +697,7 @@ public class AccountSettings extends K9PreferenceActivity {
         } else {
             final Preference mCryptoMenu = findPreference(PREFERENCE_CRYPTO);
             mCryptoMenu.setEnabled(false);
-            mCryptoMenu.setSummary(R.string.account_settings_crypto_apg_not_installed);
+            mCryptoMenu.setSummary(R.string.account_settings_no_openpgp_provider_installed);
         }
     }
 
diff --git a/src/com/fsck/k9/crypto/Apg.java b/src/com/fsck/k9/crypto/Apg.java
deleted file mode 100644
index 90fddf463..000000000
--- a/src/com/fsck/k9/crypto/Apg.java
+++ /dev/null
@@ -1,588 +0,0 @@
-package com.fsck.k9.crypto;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.ActivityNotFoundException;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.Cursor;
-import android.net.Uri;
-import android.widget.Toast;
-
-import com.fsck.k9.R;
-import com.fsck.k9.activity.MessageCompose;
-import com.fsck.k9.mail.Message;
-import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.mail.Part;
-import com.fsck.k9.mail.internet.MimeUtility;
-
-/**
- * APG integration.
- */
-public class Apg extends CryptoProvider {
-    static final long serialVersionUID = 0x21071235;
-    public static final String NAME = "apg";
-
-    private static final String mApgPackageName = "org.thialfihar.android.apg";
-    private static final int mMinRequiredVersion = 16;
-
-    public static final String AUTHORITY = "org.thialfihar.android.apg.provider";
-    public static final Uri CONTENT_URI_SECRET_KEY_RING_BY_KEY_ID =
-        Uri.parse("content://" + AUTHORITY + "/key_rings/secret/key_id/");
-    public static final Uri CONTENT_URI_SECRET_KEY_RING_BY_EMAILS =
-        Uri.parse("content://" + AUTHORITY + "/key_rings/secret/emails/");
-
-    public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_KEY_ID =
-        Uri.parse("content://" + AUTHORITY + "/key_rings/public/key_id/");
-    public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS =
-        Uri.parse("content://" + AUTHORITY + "/key_rings/public/emails/");
-
-    public static class Intent {
-        public static final String DECRYPT = "org.thialfihar.android.apg.intent.DECRYPT";
-        public static final String ENCRYPT = "org.thialfihar.android.apg.intent.ENCRYPT";
-        public static final String DECRYPT_FILE = "org.thialfihar.android.apg.intent.DECRYPT_FILE";
-        public static final String ENCRYPT_FILE = "org.thialfihar.android.apg.intent.ENCRYPT_FILE";
-        public static final String DECRYPT_AND_RETURN = "org.thialfihar.android.apg.intent.DECRYPT_AND_RETURN";
-        public static final String ENCRYPT_AND_RETURN = "org.thialfihar.android.apg.intent.ENCRYPT_AND_RETURN";
-        public static final String SELECT_PUBLIC_KEYS = "org.thialfihar.android.apg.intent.SELECT_PUBLIC_KEYS";
-        public static final String SELECT_SECRET_KEY = "org.thialfihar.android.apg.intent.SELECT_SECRET_KEY";
-    }
-
-    public static final String EXTRA_TEXT = "text";
-    public static final String EXTRA_DATA = "data";
-    public static final String EXTRA_ERROR = "error";
-    public static final String EXTRA_DECRYPTED_MESSAGE = "decryptedMessage";
-    public static final String EXTRA_ENCRYPTED_MESSAGE = "encryptedMessage";
-    public static final String EXTRA_SIGNATURE = "signature";
-    public static final String EXTRA_SIGNATURE_KEY_ID = "signatureKeyId";
-    public static final String EXTRA_SIGNATURE_USER_ID = "signatureUserId";
-    public static final String EXTRA_SIGNATURE_SUCCESS = "signatureSuccess";
-    public static final String EXTRA_SIGNATURE_UNKNOWN = "signatureUnknown";
-    public static final String EXTRA_USER_ID = "userId";
-    public static final String EXTRA_KEY_ID = "keyId";
-    public static final String EXTRA_ENCRYPTION_KEY_IDS = "encryptionKeyIds";
-    public static final String EXTRA_SELECTION = "selection";
-    public static final String EXTRA_MESSAGE = "message";
-    public static final String EXTRA_INTENT_VERSION = "intentVersion";
-
-    public static final String INTENT_VERSION = "1";
-
-    // Note: The support package only allows us to use the lower 16 bits of a request code.
-    public static final int DECRYPT_MESSAGE = 0x0000A001;
-    public static final int ENCRYPT_MESSAGE = 0x0000A002;
-    public static final int SELECT_PUBLIC_KEYS = 0x0000A003;
-    public static final int SELECT_SECRET_KEY = 0x0000A004;
-
-    public static Pattern PGP_MESSAGE =
-        Pattern.compile(".*?(-----BEGIN PGP MESSAGE-----.*?-----END PGP MESSAGE-----).*",
-                        Pattern.DOTALL);
-
-    public static Pattern PGP_SIGNED_MESSAGE =
-        Pattern.compile(".*?(-----BEGIN PGP SIGNED MESSAGE-----.*?-----BEGIN PGP SIGNATURE-----.*?-----END PGP SIGNATURE-----).*",
-                        Pattern.DOTALL);
-
-    public static Apg createInstance() {
-        return new Apg();
-    }
-
-    /**
-     * Check whether APG is installed and at a high enough version.
-     *
-     * @param context
-     * @return whether a suitable version of APG was found
-     */
-    @Override
-    public boolean isAvailable(Context context) {
-        try {
-            PackageInfo pi = context.getPackageManager().getPackageInfo(mApgPackageName, 0);
-            if (pi.versionCode >= mMinRequiredVersion) {
-                return true;
-            } else {
-                Toast.makeText(context,
-                               R.string.error_apg_version_not_supported, Toast.LENGTH_SHORT).show();
-            }
-        } catch (NameNotFoundException e) {
-            // not found
-        }
-
-        return false;
-    }
-
-    /**
-     * Select the signature key.
-     *
-     * @param activity
-     * @param pgpData
-     * @return success or failure
-     */
-    @Override
-    public boolean selectSecretKey(Activity activity, PgpData pgpData) {
-        android.content.Intent intent = new android.content.Intent(Intent.SELECT_SECRET_KEY);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        try {
-            activity.startActivityForResult(intent, Apg.SELECT_SECRET_KEY);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity,
-                           R.string.error_activity_not_found,
-                           Toast.LENGTH_SHORT).show();
-            return false;
-        }
-    }
-
-    /**
-     * Select encryption keys.
-     *
-     * @param activity
-     * @param emails The emails that should be used for preselection.
-     * @param pgpData
-     * @return success or failure
-     */
-    @Override
-    public boolean selectEncryptionKeys(Activity activity, String emails, PgpData pgpData) {
-        android.content.Intent intent = new android.content.Intent(Apg.Intent.SELECT_PUBLIC_KEYS);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        long[] initialKeyIds = null;
-        if (!pgpData.hasEncryptionKeys()) {
-            List<Long> keyIds = new ArrayList<Long>();
-            if (pgpData.hasSignatureKey()) {
-                keyIds.add(pgpData.getSignatureKeyId());
-            }
-
-            try {
-                Uri contentUri = Uri.withAppendedPath(
-                                     Apg.CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS,
-                                     emails);
-                Cursor c = activity.getContentResolver().query(contentUri,
-                           new String[] { "master_key_id" },
-                           null, null, null);
-                if (c != null) {
-                    while (c.moveToNext()) {
-                        keyIds.add(c.getLong(0));
-                    }
-                }
-
-                if (c != null) {
-                    c.close();
-                }
-            } catch (SecurityException e) {
-                Toast.makeText(activity,
-                               activity.getResources().getString(R.string.insufficient_apg_permissions),
-                               Toast.LENGTH_LONG).show();
-            }
-            if (!keyIds.isEmpty()) {
-                initialKeyIds = new long[keyIds.size()];
-                for (int i = 0, size = keyIds.size(); i < size; ++i) {
-                    initialKeyIds[i] = keyIds.get(i);
-                }
-            }
-        } else {
-            initialKeyIds = pgpData.getEncryptionKeys();
-        }
-        intent.putExtra(Apg.EXTRA_SELECTION, initialKeyIds);
-        try {
-            activity.startActivityForResult(intent, Apg.SELECT_PUBLIC_KEYS);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity,
-                           R.string.error_activity_not_found,
-                           Toast.LENGTH_SHORT).show();
-            return false;
-        }
-    }
-
-    /**
-     * Get secret key ids based on a given email.
-     *
-     * @param context
-     * @param email The email in question.
-     * @return key ids
-     */
-    @Override
-    public long[] getSecretKeyIdsFromEmail(Context context, String email) {
-        long ids[] = null;
-        try {
-            Uri contentUri = Uri.withAppendedPath(Apg.CONTENT_URI_SECRET_KEY_RING_BY_EMAILS,
-                                                  email);
-            Cursor c = context.getContentResolver().query(contentUri,
-                       new String[] { "master_key_id" },
-                       null, null, null);
-            if (c != null && c.getCount() > 0) {
-                ids = new long[c.getCount()];
-                while (c.moveToNext()) {
-                    ids[c.getPosition()] = c.getLong(0);
-                }
-            }
-
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            Toast.makeText(context,
-                           context.getResources().getString(R.string.insufficient_apg_permissions),
-                           Toast.LENGTH_LONG).show();
-        }
-
-        return ids;
-    }
-
-    /**
-     * Get public key ids based on a given email.
-     *
-     * @param context
-     * @param email The email in question.
-     * @return key ids
-     */
-    @Override
-    public long[] getPublicKeyIdsFromEmail(Context context, String email) {
-        long ids[] = null;
-        try {
-            Uri contentUri = Uri.withAppendedPath(Apg.CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS, email);
-            Cursor c = context.getContentResolver().query(contentUri,
-                       new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                ids = new long[c.getCount()];
-                while (c.moveToNext()) {
-                    ids[c.getPosition()] = c.getLong(0);
-                }
-            }
-
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            Toast.makeText(context,
-                           context.getResources().getString(R.string.insufficient_apg_permissions),
-                           Toast.LENGTH_LONG).show();
-        }
-
-        return ids;
-    }
-
-    /**
-     * Find out if a given email has a secret key.
-     *
-     * @param context
-     * @param email The email in question.
-     * @return true if there is a secret key for this email.
-     */
-    @Override
-    public boolean hasSecretKeyForEmail(Context context, String email) {
-        try {
-            Uri contentUri = Uri.withAppendedPath(Apg.CONTENT_URI_SECRET_KEY_RING_BY_EMAILS, email);
-            Cursor c = context.getContentResolver().query(contentUri,
-                    new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                c.close();
-                return true;
-            }
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            Toast.makeText(context,
-                    context.getResources().getString(R.string.insufficient_apg_permissions),
-                    Toast.LENGTH_LONG).show();
-        }
-        return false;
-    }
-
-    /**
-     * Find out if a given email has a public key.
-     *
-     * @param context
-     * @param email The email in question.
-     * @return true if there is a public key for this email.
-     */
-    @Override
-    public boolean hasPublicKeyForEmail(Context context, String email) {
-        try {
-            Uri contentUri = Uri.withAppendedPath(Apg.CONTENT_URI_PUBLIC_KEY_RING_BY_EMAILS, email);
-            Cursor c = context.getContentResolver().query(contentUri,
-                    new String[] { "master_key_id" }, null, null, null);
-            if (c != null && c.getCount() > 0) {
-                c.close();
-                return true;
-            }
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            Toast.makeText(context,
-                    context.getResources().getString(R.string.insufficient_apg_permissions),
-                    Toast.LENGTH_LONG).show();
-        }
-        return false;
-    }
-
-    /**
-     * Get the user id based on the key id.
-     *
-     * @param context
-     * @param keyId
-     * @return user id
-     */
-    @Override
-    public String getUserId(Context context, long keyId) {
-        String userId = null;
-        try {
-            Uri contentUri = ContentUris.withAppendedId(
-                                 Apg.CONTENT_URI_SECRET_KEY_RING_BY_KEY_ID,
-                                 keyId);
-            Cursor c = context.getContentResolver().query(contentUri,
-                       new String[] { "user_id" },
-                       null, null, null);
-            if (c != null && c.moveToFirst()) {
-                userId = c.getString(0);
-            }
-
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            Toast.makeText(context,
-                           context.getResources().getString(R.string.insufficient_apg_permissions),
-                           Toast.LENGTH_LONG).show();
-        }
-
-        if (userId == null) {
-            userId = context.getString(R.string.unknown_crypto_signature_user_id);
-        }
-        return userId;
-    }
-
-    /**
-     * Handle the activity results that concern us.
-     *
-     * @param activity
-     * @param requestCode
-     * @param resultCode
-     * @param data
-     * @return handled or not
-     */
-    @Override
-    public boolean onActivityResult(Activity activity, int requestCode, int resultCode,
-                                    android.content.Intent data, PgpData pgpData) {
-        switch (requestCode) {
-        case Apg.SELECT_SECRET_KEY:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                break;
-            }
-            pgpData.setSignatureKeyId(data.getLongExtra(Apg.EXTRA_KEY_ID, 0));
-            pgpData.setSignatureUserId(data.getStringExtra(Apg.EXTRA_USER_ID));
-            ((MessageCompose) activity).updateEncryptLayout();
-            break;
-
-        case Apg.SELECT_PUBLIC_KEYS:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                pgpData.setEncryptionKeys(null);
-                ((MessageCompose) activity).onEncryptionKeySelectionDone();
-                break;
-            }
-            pgpData.setEncryptionKeys(data.getLongArrayExtra(Apg.EXTRA_SELECTION));
-            ((MessageCompose) activity).onEncryptionKeySelectionDone();
-            break;
-
-        case Apg.ENCRYPT_MESSAGE:
-            if (resultCode != Activity.RESULT_OK || data == null) {
-                pgpData.setEncryptionKeys(null);
-                ((MessageCompose) activity).onEncryptDone();
-                break;
-            }
-            pgpData.setEncryptedData(data.getStringExtra(Apg.EXTRA_ENCRYPTED_MESSAGE));
-            // this was a stupid bug in an earlier version, just gonna leave this in for an APG
-            // version or two
-            if (pgpData.getEncryptedData() == null) {
-                pgpData.setEncryptedData(data.getStringExtra(Apg.EXTRA_DECRYPTED_MESSAGE));
-            }
-            if (pgpData.getEncryptedData() != null) {
-                ((MessageCompose) activity).onEncryptDone();
-            }
-            break;
-
-        default:
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onDecryptActivityResult(CryptoDecryptCallback callback, int requestCode,
-            int resultCode, android.content.Intent data, PgpData pgpData) {
-
-        switch (requestCode) {
-            case Apg.DECRYPT_MESSAGE: {
-                if (resultCode != Activity.RESULT_OK || data == null) {
-                    break;
-                }
-
-                pgpData.setSignatureUserId(data.getStringExtra(Apg.EXTRA_SIGNATURE_USER_ID));
-                pgpData.setSignatureKeyId(data.getLongExtra(Apg.EXTRA_SIGNATURE_KEY_ID, 0));
-                pgpData.setSignatureSuccess(data.getBooleanExtra(Apg.EXTRA_SIGNATURE_SUCCESS, false));
-                pgpData.setSignatureUnknown(data.getBooleanExtra(Apg.EXTRA_SIGNATURE_UNKNOWN, false));
-
-                pgpData.setDecryptedData(data.getStringExtra(Apg.EXTRA_DECRYPTED_MESSAGE));
-                callback.onDecryptDone(pgpData);
-
-                break;
-            }
-            default: {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Start the encrypt activity.
-     *
-     * @param activity
-     * @param data
-     * @param pgpData
-     * @return success or failure
-     */
-    @Override
-    public boolean encrypt(Activity activity, String data, PgpData pgpData) {
-        android.content.Intent intent = new android.content.Intent(Intent.ENCRYPT_AND_RETURN);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        intent.setType("text/plain");
-        intent.putExtra(Apg.EXTRA_TEXT, data);
-        intent.putExtra(Apg.EXTRA_ENCRYPTION_KEY_IDS, pgpData.getEncryptionKeys());
-        intent.putExtra(Apg.EXTRA_SIGNATURE_KEY_ID, pgpData.getSignatureKeyId());
-        try {
-            activity.startActivityForResult(intent, Apg.ENCRYPT_MESSAGE);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity,
-                           R.string.error_activity_not_found,
-                           Toast.LENGTH_SHORT).show();
-            return false;
-        }
-    }
-
-    /**
-     * Start the decrypt activity.
-     *
-     * @param fragment
-     * @param data
-     * @param pgpData
-     * @return success or failure
-     */
-    @Override
-    public boolean decrypt(Fragment fragment, String data, PgpData pgpData) {
-        android.content.Intent intent = new android.content.Intent(Apg.Intent.DECRYPT_AND_RETURN);
-        intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
-        intent.setType("text/plain");
-        if (data == null) {
-            return false;
-        }
-        try {
-            intent.putExtra(EXTRA_TEXT, data);
-            fragment.startActivityForResult(intent, Apg.DECRYPT_MESSAGE);
-            return true;
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(fragment.getActivity(), R.string.error_activity_not_found, Toast.LENGTH_SHORT).show();
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isEncrypted(Message message) {
-        String data = null;
-        try {
-            Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain");
-            if (part == null) {
-                part = MimeUtility.findFirstPartByMimeType(message, "text/html");
-            }
-            if (part != null) {
-                data = MimeUtility.getTextFromPart(part);
-            }
-        } catch (MessagingException e) {
-            // guess not...
-            // TODO: maybe log this?
-        }
-
-        if (data == null) {
-            return false;
-        }
-
-        Matcher matcher = PGP_MESSAGE.matcher(data);
-        return matcher.matches();
-    }
-
-    @Override
-    public boolean isSigned(Message message) {
-        String data = null;
-        try {
-            Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain");
-            if (part == null) {
-                part = MimeUtility.findFirstPartByMimeType(message, "text/html");
-            }
-            if (part != null) {
-                data = MimeUtility.getTextFromPart(part);
-            }
-        } catch (MessagingException e) {
-            // guess not...
-            // TODO: maybe log this?
-        }
-
-        if (data == null) {
-            return false;
-        }
-
-        Matcher matcher = PGP_SIGNED_MESSAGE.matcher(data);
-        return matcher.matches();
-    }
-
-    /**
-     * Get the name of the provider.
-     *
-     * @return provider name
-     */
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    /**
-     * Test the APG installation.
-     *
-     * @return success or failure
-     */
-    @Override
-    public boolean test(Context context) {
-        if (!isAvailable(context)) {
-            return false;
-        }
-
-        try {
-            // try out one content provider to check permissions
-            Uri contentUri = ContentUris.withAppendedId(
-                                 Apg.CONTENT_URI_SECRET_KEY_RING_BY_KEY_ID,
-                                 12345);
-            Cursor c = context.getContentResolver().query(contentUri,
-                       new String[] { "user_id" },
-                       null, null, null);
-            if (c != null) {
-                c.close();
-            }
-        } catch (SecurityException e) {
-            // if there was a problem, then let the user know, this will not stop K9/APG from
-            // working, but some features won't be available, so we can still return "true"
-            Toast.makeText(context,
-                           context.getResources().getString(R.string.insufficient_apg_permissions),
-                           Toast.LENGTH_LONG).show();
-        }
-
-        return true;
-    }
-}
diff --git a/src/com/fsck/k9/crypto/CryptoProvider.java b/src/com/fsck/k9/crypto/CryptoProvider.java
deleted file mode 100644
index f41d92715..000000000
--- a/src/com/fsck/k9/crypto/CryptoProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.fsck.k9.crypto;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.app.Fragment;
-
-import com.fsck.k9.mail.Message;
-
-/**
- * A CryptoProvider provides functionalities such as encryption, decryption, digital signatures.
- * It currently also stores the results of such encryption or decryption.
- * TODO: separate the storage from the provider
- */
-abstract public class CryptoProvider {
-    static final long serialVersionUID = 0x21071234;
-
-    abstract public boolean isAvailable(Context context);
-    abstract public boolean isEncrypted(Message message);
-    abstract public boolean isSigned(Message message);
-    abstract public boolean onActivityResult(Activity activity, int requestCode, int resultCode,
-            Intent data, PgpData pgpData);
-    abstract public boolean onDecryptActivityResult(CryptoDecryptCallback callback,
-            int requestCode, int resultCode, Intent data, PgpData pgpData);
-    abstract public boolean selectSecretKey(Activity activity, PgpData pgpData);
-    abstract public boolean selectEncryptionKeys(Activity activity, String emails, PgpData pgpData);
-    abstract public boolean encrypt(Activity activity, String data, PgpData pgpData);
-    abstract public boolean decrypt(Fragment fragment, String data, PgpData pgpData);
-    abstract public long[] getSecretKeyIdsFromEmail(Context context, String email);
-    abstract public long[] getPublicKeyIdsFromEmail(Context context, String email);
-    abstract public boolean hasSecretKeyForEmail(Context context, String email);
-    abstract public boolean hasPublicKeyForEmail(Context context, String email);
-    abstract public String getUserId(Context context, long keyId);
-    abstract public String getName();
-    abstract public boolean test(Context context);
-
-    public static CryptoProvider createInstance(String name) {
-        if (Apg.NAME.equals(name)) {
-            return Apg.createInstance();
-        }
-
-        return None.createInstance();
-    }
-
-    public interface CryptoDecryptCallback {
-        void onDecryptDone(PgpData pgpData);
-    }
-}
diff --git a/src/com/fsck/k9/crypto/None.java b/src/com/fsck/k9/crypto/None.java
deleted file mode 100644
index d897f5e6c..000000000
--- a/src/com/fsck/k9/crypto/None.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.fsck.k9.crypto;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.Intent;
-
-import com.fsck.k9.mail.Message;
-
-/**
- * Dummy CryptoProvider for when cryptography is disabled. It is never "available" and doesn't
- * do anything.
- */
-public class None extends CryptoProvider {
-    static final long serialVersionUID = 0x21071230;
-    public static final String NAME = "";
-
-    public static None createInstance() {
-        return new None();
-    }
-
-    @Override
-    public boolean isAvailable(Context context) {
-        return false;
-    }
-
-    @Override
-    public boolean selectSecretKey(Activity activity, PgpData pgpData) {
-        return false;
-    }
-
-    @Override
-    public boolean selectEncryptionKeys(Activity activity, String emails, PgpData pgpData) {
-        return false;
-    }
-
-    @Override
-    public long[] getSecretKeyIdsFromEmail(Context context, String email) {
-        return null;
-    }
-
-    @Override
-    public long[] getPublicKeyIdsFromEmail(Context context, String email) {
-        return null;
-    }
-
-    @Override
-    public boolean hasSecretKeyForEmail(Context context, String email) {
-        return false;
-    }
-
-    @Override
-    public boolean hasPublicKeyForEmail(Context context, String email) {
-        return false;
-    }
-
-    @Override
-    public String getUserId(Context context, long keyId) {
-        return null;
-    }
-
-    @Override
-    public boolean onActivityResult(Activity activity, int requestCode, int resultCode,
-                                    android.content.Intent data, PgpData pgpData) {
-        return false;
-    }
-
-    @Override
-    public boolean onDecryptActivityResult(CryptoDecryptCallback callback, int requestCode,
-            int resultCode, Intent data, PgpData pgpData) {
-        return false;
-    }
-
-    @Override
-    public boolean encrypt(Activity activity, String data, PgpData pgpData) {
-        return false;
-    }
-
-    @Override
-    public boolean decrypt(Fragment fragment, String data, PgpData pgpData) {
-        return false;
-    }
-
-    @Override
-    public boolean isEncrypted(Message message) {
-        return false;
-    }
-
-    @Override
-    public boolean isSigned(Message message) {
-        return false;
-    }
-
-    @Override
-    public String getName() {
-        return NAME;
-    }
-
-    @Override
-    public boolean test(Context context) {
-        return true;
-    }
-}
diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
index 5f267bb64..2e63ebf3f 100644
--- a/src/com/fsck/k9/fragment/MessageViewFragment.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -30,7 +30,6 @@ import com.fsck.k9.activity.ChooseFolder;
 import com.fsck.k9.activity.MessageReference;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
-import com.fsck.k9.crypto.CryptoProvider.CryptoDecryptCallback;
 import com.fsck.k9.crypto.PgpData;
 import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 import com.fsck.k9.helper.FileBrowserHelper;
@@ -49,7 +48,7 @@ import org.openintents.openpgp.OpenPgpSignatureResult;
 
 
 public class MessageViewFragment extends Fragment implements OnClickListener,
-        CryptoDecryptCallback, ConfirmationDialogFragmentListener {
+        ConfirmationDialogFragmentListener {
 
     private static final String ARG_REFERENCE = "reference";
 
@@ -427,10 +426,6 @@ public class MessageViewFragment extends Fragment implements OnClickListener,
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (mAccount.getCryptoProvider().onDecryptActivityResult(this, requestCode, resultCode, data, mPgpData)) {
-            return;
-        }
-
         if (resultCode != Activity.RESULT_OK) {
             return;
         }
@@ -732,20 +727,6 @@ public class MessageViewFragment extends Fragment implements OnClickListener,
         }
     }
 
-    // This REALLY should be in MessageCryptoView
-    @Override
-    public void onDecryptDone(PgpData pgpData) {
-        Account account = mAccount;
-        LocalMessage message = (LocalMessage) mMessage;
-        MessagingController controller = mController;
-        Listener listener = mListener;
-        try {
-            mMessageView.setMessage(account, message, pgpData, controller, listener);
-        } catch (MessagingException e) {
-            Log.e(K9.LOG_TAG, "displayMessageBody failed", e);
-        }
-    }
-
     private void showDialog(int dialogId) {
         DialogFragment fragment;
         switch (dialogId) {
diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java
index ee4705214..c2b6b4983 100644
--- a/src/com/fsck/k9/preferences/AccountSettings.java
+++ b/src/com/fsck/k9/preferences/AccountSettings.java
@@ -13,7 +13,6 @@ import com.fsck.k9.Account.SortType;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
 import com.fsck.k9.Account.FolderMode;
-import com.fsck.k9.crypto.Apg;
 import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.preferences.Settings.*;
 
@@ -50,13 +49,8 @@ public class AccountSettings {
                 new V(1, new ColorSetting(0xFF0000FF))
             ));
         s.put("cryptoApp", Settings.versions(
-                new V(1, new StringSetting(Apg.NAME))
-            ));
-        s.put("cryptoAutoEncrypt", Settings.versions(
-                new V(3, new BooleanSetting(false))
-            ));
-        s.put("cryptoAutoSignature", Settings.versions(
-                new V(1, new BooleanSetting(false))
+                new V(1, new StringSetting("apg")),
+                new V(36, new StringSetting(Account.NO_OPENPGP_PROVIDER))
             ));
         s.put("defaultQuotedTextShown", Settings.versions(
                 new V(1, new BooleanSetting(Account.DEFAULT_QUOTED_TEXT_SHOWN))
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index 1d06b7fd2..29741828a 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 35;
+    public static final int VERSION = 36;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,
diff --git a/src/com/fsck/k9/view/MessageCryptoView.java b/src/com/fsck/k9/view/MessageCryptoView.java
deleted file mode 100644
index 0c99e147d..000000000
--- a/src/com/fsck/k9/view/MessageCryptoView.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.fsck.k9.view;
-
-import android.content.Context;
-import android.app.Fragment;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.*;
-import com.fsck.k9.K9;
-import com.fsck.k9.R;
-import com.fsck.k9.crypto.CryptoProvider;
-import com.fsck.k9.crypto.PgpData;
-import com.fsck.k9.mail.Message;
-import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.mail.Part;
-import com.fsck.k9.mail.internet.MimeUtility;
-
-
-public class MessageCryptoView extends LinearLayout {
-
-    private Context mContext;
-    private Fragment mFragment;
-    private Button mDecryptButton;
-    private LinearLayout mCryptoSignatureLayout = null;
-    private ImageView mCryptoSignatureStatusImage = null;
-    private TextView mCryptoSignatureUserId = null;
-    private TextView mCryptoSignatureUserIdRest = null;
-
-
-    public MessageCryptoView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-    }
-
-    public void setupChildViews() {
-        mCryptoSignatureLayout = (LinearLayout) findViewById(R.id.crypto_signature);
-        mCryptoSignatureStatusImage = (ImageView) findViewById(R.id.ic_crypto_signature_status);
-        mCryptoSignatureUserId = (TextView) findViewById(R.id.userId);
-        mCryptoSignatureUserIdRest = (TextView) findViewById(R.id.userIdRest);
-        mCryptoSignatureLayout.setVisibility(View.INVISIBLE);
-        mDecryptButton = (Button) findViewById(R.id.btn_decrypt);
-    }
-
-    public void setFragment(Fragment fragment) {
-        mFragment = fragment;
-
-    }
-
-
-    public void hide() {
-        this.setVisibility(View.GONE);
-    }
-
-    /**
-     * Fill the decrypt layout with signature data, if known, make controls visible, if
-     * they should be visible.
-     */
-    public void updateLayout(final CryptoProvider cryptoProvider, final PgpData pgpData, final Message message) {
-        if (pgpData.getSignatureKeyId() != 0) {
-            mCryptoSignatureUserIdRest.setText(
-                mContext.getString(R.string.key_id, Long.toHexString(pgpData.getSignatureKeyId() & 0xffffffffL)));
-            String userId = pgpData.getSignatureUserId();
-            if (userId == null) {
-                userId = mContext.getString(R.string.unknown_crypto_signature_user_id);
-            }
-            String chunks[] = userId.split(" <", 2);
-            String name = chunks[0];
-            if (chunks.length > 1) {
-                mCryptoSignatureUserIdRest.setText("<" + chunks[1]);
-            }
-            mCryptoSignatureUserId.setText(name);
-            if (pgpData.getSignatureSuccess()) {
-                mCryptoSignatureStatusImage.setImageResource(R.drawable.overlay_ok);
-            } else if (pgpData.getSignatureUnknown()) {
-                mCryptoSignatureStatusImage.setImageResource(R.drawable.overlay_error);
-            } else {
-                mCryptoSignatureStatusImage.setImageResource(R.drawable.overlay_error);
-            }
-            mCryptoSignatureLayout.setVisibility(View.VISIBLE);
-            this.setVisibility(View.VISIBLE);
-        } else {
-            mCryptoSignatureLayout.setVisibility(View.INVISIBLE);
-        }
-        if ((message == null) && (pgpData.getDecryptedData() == null)) {
-            this.setVisibility(View.GONE);
-            return;
-        }
-        if (pgpData.getDecryptedData() != null) {
-            if (pgpData.getSignatureKeyId() == 0) {
-                this.setVisibility(View.GONE);
-            } else {
-                // no need to show this after decryption/verification
-                mDecryptButton.setVisibility(View.GONE);
-            }
-            return;
-        }
-
-
-        mDecryptButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    String data = null;
-                    Part part = MimeUtility.findFirstPartByMimeType(message, "text/plain");
-                    if (part == null) {
-                        part = MimeUtility.findFirstPartByMimeType(message, "text/html");
-                    }
-                    if (part != null) {
-                        data = MimeUtility.getTextFromPart(part);
-                    }
-                    cryptoProvider.decrypt(mFragment, data, pgpData);
-                } catch (MessagingException me) {
-                    Log.e(K9.LOG_TAG, "Unable to decrypt email.", me);
-                }
-            }
-        });
-
-
-        mDecryptButton.setVisibility(View.VISIBLE);
-        if (cryptoProvider.isEncrypted(message)) {
-            mDecryptButton.setText(R.string.btn_decrypt);
-            this.setVisibility(View.VISIBLE);
-        } else if (cryptoProvider.isSigned(message)) {
-            mDecryptButton.setText(R.string.btn_verify);
-            this.setVisibility(View.VISIBLE);
-        } else {
-            this.setVisibility(View.GONE);
-            try {
-                // check for PGP/MIME encryption
-                Part pgp = MimeUtility.findFirstPartByMimeType(message, "application/pgp-encrypted");
-                if (pgp != null) {
-                    Toast.makeText(mContext, R.string.pgp_mime_unsupported, Toast.LENGTH_LONG).show();
-                }
-            } catch (MessagingException e) {
-                // nothing to do...
-            }
-        }
-    }
-
-}
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 58a5821cf..60ffd8797 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -6,6 +6,7 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLDecoder;
+
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.ActivityNotFoundException;
@@ -41,7 +42,6 @@ import com.fsck.k9.K9;
 import com.fsck.k9.R;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
-import com.fsck.k9.crypto.CryptoProvider;
 import com.fsck.k9.crypto.PgpData;
 import com.fsck.k9.fragment.MessageViewFragment;
 import com.fsck.k9.helper.ClipboardManager;
@@ -87,7 +87,6 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     private static final int DISPLAY_NAME_INDEX = 1;
 
 
-    private MessageCryptoView mCryptoView;
     private MessageOpenPgpView mOpenPgpView;
     private MessageWebView mMessageContentView;
     private MessageHeader mHeaderContainer;
@@ -125,9 +124,6 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
         mHiddenAttachments.setVisibility(View.GONE);
         mShowHiddenAttachments = (Button) findViewById(R.id.show_hidden_attachments);
         mShowHiddenAttachments.setVisibility(View.GONE);
-        mCryptoView = (MessageCryptoView) findViewById(R.id.layout_decrypt);
-        mCryptoView.setFragment(fragment);
-        mCryptoView.setupChildViews();
         mOpenPgpView = (MessageOpenPgpView) findViewById(R.id.layout_decrypt_openpgp);
         mOpenPgpView.setFragment(fragment);
         mOpenPgpView.setupChildViews();
@@ -571,7 +567,6 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
 
         if (text != null) {
             loadBodyFromText(text);
-            updateCryptoLayout(account.getCryptoProvider(), pgpData, message);
             mOpenPgpView.updateLayout(account, pgpData.getDecryptedData(),
                     pgpData.getSignatureResult(), message);
         } else {
@@ -582,17 +577,12 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
     public void showStatusMessage(String status) {
         String text = "<div style=\"text-align:center; color: grey;\">" + status + "</div>";
         loadBodyFromText(text);
-        mCryptoView.hide();
     }
 
     private void loadBodyFromText(String emailText) {
         mMessageContentView.setText(emailText);
     }
 
-    public void updateCryptoLayout(CryptoProvider cp, PgpData pgpData, Message message) {
-        mCryptoView.updateLayout(cp, pgpData, message);
-    }
-
     public void showAttachments(boolean show) {
         mAttachmentsContainer.setVisibility(show ? View.VISIBLE : View.GONE);
         boolean showHidden = (show && mHiddenAttachments.getVisibility() == View.GONE &&

From ff72a63e1797a1635ed8b46e804eb5989bf7b4f2 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 18 Sep 2014 20:05:12 +0200
Subject: [PATCH 3/4] Remove APG permission

---
 AndroidManifest.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ea3acb665..c80a619ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,8 +32,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
-    <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"/>
-
     <permission
         android:name="com.fsck.k9.permission.READ_ATTACHMENT"
         android:description="@string/read_attachment_desc"

From 8cfd73f6b70657145d41f28e03e700f7126ec445 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 18 Sep 2014 20:27:05 +0200
Subject: [PATCH 4/4] Remove unused strings

---
 res/values-ca/strings.xml     | 16 ----------------
 res/values-cs/strings.xml     | 16 ----------------
 res/values-da/strings.xml     | 16 ----------------
 res/values-de/strings.xml     | 16 ----------------
 res/values-el/strings.xml     | 16 ----------------
 res/values-es/strings.xml     | 16 ----------------
 res/values-et/strings.xml     | 11 -----------
 res/values-eu/strings.xml     | 16 ----------------
 res/values-fi/strings.xml     | 16 ----------------
 res/values-fr/strings.xml     | 16 ----------------
 res/values-gl-rES/strings.xml | 16 ----------------
 res/values-gl/strings.xml     | 10 ----------
 res/values-hu/strings.xml     | 15 ---------------
 res/values-it/strings.xml     | 16 ----------------
 res/values-iw/strings.xml     |  7 -------
 res/values-ja/strings.xml     | 16 ----------------
 res/values-ko/strings.xml     | 16 ----------------
 res/values-lt/strings.xml     | 16 ----------------
 res/values-lv/strings.xml     | 16 ----------------
 res/values-nb/strings.xml     | 14 --------------
 res/values-nl/strings.xml     | 16 ----------------
 res/values-pl/strings.xml     | 16 ----------------
 res/values-pt-rBR/strings.xml | 16 ----------------
 res/values-ru/strings.xml     | 16 ----------------
 res/values-sk/strings.xml     | 16 ----------------
 res/values-sv/strings.xml     | 16 ----------------
 res/values-tr/strings.xml     | 16 ----------------
 res/values-uk/strings.xml     | 16 ----------------
 res/values-zh-rCN/strings.xml | 16 ----------------
 res/values-zh-rTW/strings.xml | 16 ----------------
 res/values/strings.xml        | 17 -----------------
 31 files changed, 474 deletions(-)
 mode change 100755 => 100644 res/values-fi/strings.xml

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f0ae6c3ff..e502dded3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -49,7 +49,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="account_delete_dlg_instructions_fmt">El compte \"<xliff:g id="account">%s</xliff:g>\" serà esborrat de K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Totes les dades de \"<xliff:g id="account">%s</xliff:g>\" seran esborrades de K-9 Mail, però la configuració del compte romandrà.</string>
   <string name="account_clear_dlg_instructions_fmt">Tots els missatges a \"<xliff:g id="account">%s</xliff:g>\" seran esborrats de K-9 Mail, però la configuració del compte romandrà.</string>
-  <string name="insufficient_apg_permissions">K-9 no té permís per accedir plenament a l\'APG, si us plau, reinstal la el K-9 per esmenar-ho.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">No s\'a trobat cap aplicació per realitzar la importació. Instal·leu un gestor d\'arxius des de Google Play Store.</string>
   <string name="open_market">Obre la Play Store</string>
@@ -100,8 +99,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="move_action">Mou</string>
   <string name="single_message_options_action">Opcions del missatge…</string>
   <string name="refile_action">Rearxiva…</string>
-  <string name="continue_action">Continua</string>
-  <string name="back_action">Enrere</string>
   <string name="done_action">Fet</string>
   <string name="discard_action">Descarta</string>
   <string name="save_draft_action">Desa com a esborrany</string>
@@ -437,12 +434,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="account_settings_quote_prefix_label">Prefix de cita del text</string>
   <string name="account_settings_crypto">Criptografia</string>
   <string name="account_settings_crypto_app">Proveïdor d\'OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Cap</string>
-  <string name="account_settings_crypto_auto_signature">Autoconnexió</string>
-  <string name="account_settings_crypto_auto_signature_summary">Utilitza l\'adreça del compte per endevinar la clau de la signatura.</string>
-  <string name="account_settings_crypto_auto_encrypt">Encriptació automàtica</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">S\'encripta automàticament quan es troba la clau pública del destinatari.</string>
-  <string name="account_settings_crypto_apg_not_installed">No s\'ha instal·lat l\'APG.</string>
   <string name="account_settings_mail_check_frequency_label">Freqüència de comprovació de les carpetes</string>
   <string name="account_settings_storage_title">Emmagatzematge</string>
   <string name="account_settings_color_label">Color del compte</string>
@@ -704,15 +695,10 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="font_size_large">Gran</string>
   <string name="font_size_larger">Més gran</string>
   <string name="miscellaneous_preferences">Miscel·lània</string>
-  <!--APG related-->
   <string name="error_activity_not_found">No s\'ha trobat cap aplicació idònia per a aquesta acció.</string>
-  <string name="error_apg_version_not_supported">Versió APG instal·lada no suportada.</string>
   <string name="btn_crypto_sign">Inicia</string>
   <string name="btn_encrypt">Encripta</string>
-  <string name="btn_decrypt">Desencripta</string>
-  <string name="btn_verify">Verifica</string>
   <string name="unknown_crypto_signature_user_id">&lt;desconegut&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Encara no hi ha suport per a missatges PGP/MIME.</string>
   <string name="attachment_encryption_unsupported">Alerta: els adjunts encara NO estan signats o encriptats.</string>
   <string name="send_aborted">Tramesa suspesa</string>
@@ -722,8 +708,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="confirm_discard_draft_message">Esteu segurs de voler descartar aquest missatge?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refusa guardar esborradors de missatges</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refusa desar esborradors de missatges marcats com a encriptats.</string>
-  <string name="continue_without_public_key_dlg_title">Voleu continuar sense clau pública?</string>
-  <string name="continue_without_public_key_instructions_fmt">Un o més destinataris no han desat una clau pública. Voleu continuar?</string>
   <string name="select_text_now">Seleccioneu el text a copiar.</string>
   <string name="dialog_confirm_delete_title">Confirma esborrar</string>
   <string name="dialog_confirm_delete_message">Voleu esborrar aquest missatge?</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d1a3a5938..1a7cebe0c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -50,7 +50,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstraněn z K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Všechna místní data účtu \"<xliff:g id="account">%s</xliff:g>\" budou z K-9 Mail odstraněna, ale nastavení účtu bude zachováno.</string>
   <string name="account_clear_dlg_instructions_fmt">Místní zprávy v účtu \"<xliff:g id="account">%s</xliff:g>\" budou z K-9 Mail odstraněny, ale nastavení účtu bude zachováno.</string>
-  <string name="insufficient_apg_permissions">K-9 nemá oprávnění k plnému přístupu k APG, přeinstalujte prosím pro opravu balíček K-9.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Prosím nainstalujte nějaký file manager pro pokračování v importu.</string>
   <string name="open_market">Otevřít obchod Google Play</string>
@@ -101,8 +100,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="move_action">Přesunout</string>
   <string name="single_message_options_action">Vlastnosti zprávy…</string>
   <string name="refile_action">Přesměrovat…</string>
-  <string name="continue_action">Pokračovat</string>
-  <string name="back_action">Zpět</string>
   <string name="done_action">Hotovo</string>
   <string name="discard_action">Zrušit</string>
   <string name="save_draft_action">Uložit jako koncept</string>
@@ -453,12 +450,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="account_settings_quote_prefix_label">Předpona citovaného textu</string>
   <string name="account_settings_crypto">Šifrování</string>
   <string name="account_settings_crypto_app">Poskytovatel OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Žádný</string>
-  <string name="account_settings_crypto_auto_signature">Automatický podpis</string>
-  <string name="account_settings_crypto_auto_signature_summary">Použít emailovou adresu účtu pro odhadnutí podpisového klíče.</string>
-  <string name="account_settings_crypto_auto_encrypt">Automaticky zašifrovat</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automaticky zašifrovat jestliže veřejný klíč odpovídá adresátovy.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG není nainstalován</string>
   <string name="account_settings_mail_check_frequency_label">Frekvence dotazování složky</string>
   <string name="account_settings_storage_title">Úložiště</string>
   <string name="account_settings_color_label">Barva účtu</string>
@@ -724,15 +715,10 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="font_size_large">Velký</string>
   <string name="font_size_larger">Největší</string>
   <string name="miscellaneous_preferences">Různé</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Pro tuto akci nebyla nalezena žádná vhodná aplikace.</string>
-  <string name="error_apg_version_not_supported">Nainstalovaná verze APG není podporována.</string>
   <string name="btn_crypto_sign">Podepsat</string>
   <string name="btn_encrypt">Šifrovat</string>
-  <string name="btn_decrypt">Dešifrovat</string>
-  <string name="btn_verify">Ověřit</string>
   <string name="unknown_crypto_signature_user_id">&lt;neznámý&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Formát zpráv PGP/MIME ještě není podporován.</string>
   <string name="attachment_encryption_unsupported">Upozornění: přílohy ještě NELZE podepsat nebo šifrovat.</string>
   <string name="send_aborted">Odeslání přerušeno.</string>
@@ -742,8 +728,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="confirm_discard_draft_message">Opravdu si přejete smazat tuto zprávu?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Odmítnout uložení konceptu zprávy.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Odmítnout uložení konceptu šifrované zprávy.</string>
-  <string name="continue_without_public_key_dlg_title">Pokračovat bez veřejného klíče?</string>
-  <string name="continue_without_public_key_instructions_fmt">Jeden nebo více adresátů nemá uložen veřejný klíč. Pokračovat?</string>
   <string name="select_text_now">Vyberte text pro kopírování.</string>
   <string name="dialog_confirm_delete_title">Potvrzení mazání</string>
   <string name="dialog_confirm_delete_message">Chcete smazat tuto zprávu?</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 828bee975..84ab860cc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -47,7 +47,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="account_delete_dlg_instructions_fmt">Kontoen  \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet fra K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Alle mails, vedhæftede filer, mapper og mappe-indstillinger for \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet fra K-9 Mail, men kontoindstillinger vil blive husket.</string>
   <string name="account_clear_dlg_instructions_fmt">Alle mails i \"<xliff:g id="account">%s</xliff:g>\" vil blive fjernet, men kontoindstillinger vil blive husket.</string>
-  <string name="insufficient_apg_permissions">K-9 har ikke tilstrækkelig tilladelse til at benytte APG, geninstaller K-9 for at give fuld adgang.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Du skal have en filemanager installeret for at kunne importere.</string>
   <string name="open_market">Åben Play Store</string>
@@ -97,8 +96,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="forward_action">Videresend</string>
   <string name="move_action">Flyt</string>
   <string name="single_message_options_action">Send…</string>
-  <string name="continue_action">Fortsæt</string>
-  <string name="back_action">Tilbage</string>
   <string name="done_action">Afslut</string>
   <string name="discard_action">Slet</string>
   <string name="save_draft_action">Gem som kladde</string>
@@ -432,12 +429,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="account_settings_quote_prefix_label">Citeret tekst prefix</string>
   <string name="account_settings_crypto">Kryptering</string>
   <string name="account_settings_crypto_app">OpenPGP leverandør</string>
-  <string name="account_settings_crypto_app_none">Ingen</string>
-  <string name="account_settings_crypto_auto_signature">Auto signering</string>
-  <string name="account_settings_crypto_auto_signature_summary">Benyt kontoens mail addresse til at gætte signaturnøgle.</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto kryptering</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automatisk kryptering hvis offentlig nøgle matcher en modtager.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG ikke installeret</string>
   <string name="account_settings_mail_check_frequency_label">Frekvens for hentning af mails</string>
   <string name="account_settings_storage_title">Lagring</string>
   <string name="account_settings_color_label">Kontofarve</string>
@@ -698,15 +689,10 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="font_size_large">Større</string>
   <string name="font_size_larger">Størst</string>
   <string name="miscellaneous_preferences">Diverse</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Kunne ikke finde noget program som kan udføre denne handling.</string>
-  <string name="error_apg_version_not_supported">Den installerede version af APG understørttes ikke.</string>
   <string name="btn_crypto_sign">Signer</string>
   <string name="btn_encrypt">Krypter</string>
-  <string name="btn_decrypt">Dekrypter</string>
-  <string name="btn_verify">Verificer</string>
   <string name="unknown_crypto_signature_user_id">&lt;ukendt&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME meddelelser er ikke understøttet endnu.</string>
   <string name="attachment_encryption_unsupported">Advarsel: vedhæftninger er IKKE signerede eller krypterede endnu.</string>
   <string name="send_aborted">Send afbrudt.</string>
@@ -714,8 +700,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="save_or_discard_draft_message_instructions_fmt">Gem eller fortryd denne meddelelse?</string>
   <string name="confirm_discard_draft_message_title">Annuler meddelelse?</string>
   <string name="confirm_discard_draft_message">Er du sikker på at du ønsker at annulere denne meddelelse?</string>
-  <string name="continue_without_public_key_dlg_title">Fortsæt uden offentlig nøgle?</string>
-  <string name="continue_without_public_key_instructions_fmt">En eller flere modtagere har ikke en offentlig nøgle. Fortsæt?</string>
   <string name="select_text_now">Vælg tekst som skal kopieres.</string>
   <string name="dialog_confirm_delete_title">Bekræft sletning</string>
   <string name="dialog_confirm_delete_message">Ønsker du at slette denne mail?</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 68e6a76ac..8479cd434 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -50,7 +50,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird gelöscht.</string>
   <string name="account_recreate_dlg_instructions_fmt">Alle Daten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>
   <string name="account_clear_dlg_instructions_fmt">Alle Nachrichten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>
-  <string name="insufficient_apg_permissions">K-9 hat keinen Vollzugriff auf APG, bitte dafür K-9 neu installieren.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Es wurde keine geeignete Anwendung gefunden, um den Import durchzuführen. Bitte installieren Sie einen Dateimanager aus dem Play Store.</string>
   <string name="open_market">Play Store öffnen</string>
@@ -101,8 +100,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="move_action">Verschieben</string>
   <string name="single_message_options_action">Aktionen…</string>
   <string name="refile_action">Umsortieren…</string>
-  <string name="continue_action">Fortfahren</string>
-  <string name="back_action">Zurück</string>
   <string name="done_action">Fertig</string>
   <string name="discard_action">Verwerfen</string>
   <string name="save_draft_action">Speichern</string>
@@ -462,12 +459,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="account_settings_quote_prefix_label">Zitat-Präfix</string>
   <string name="account_settings_crypto">Kryptographie</string>
   <string name="account_settings_crypto_app">OpenPGP-Provider</string>
-  <string name="account_settings_crypto_app_none">Keiner</string>
-  <string name="account_settings_crypto_auto_signature">Automatisches Signieren</string>
-  <string name="account_settings_crypto_auto_signature_summary">E-Mail-Adresse des Kontos verwenden, um den Signaturschlüssel zu finden</string>
-  <string name="account_settings_crypto_auto_encrypt">Automatische Verschlüsselung</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automatisch verschlüsseln, falls für den Empfänger ein öffentlicher Schlüssel vorhanden ist</string>
-  <string name="account_settings_crypto_apg_not_installed">APG ist nicht installiert</string>
   <string name="account_settings_mail_check_frequency_label">Häufigkeit der E-Mail-Abfrage</string>
   <string name="account_settings_storage_title">Speicher</string>
   <string name="account_settings_color_label">Kontofarbe</string>
@@ -738,15 +729,10 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="font_size_large">Groß</string>
   <string name="font_size_larger">Größer</string>
   <string name="miscellaneous_preferences">Verschiedenes</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Keine geeignete Anwendung für diese Aktion gefunden.</string>
-  <string name="error_apg_version_not_supported">Die installierte APG-Version wird nicht unterstützt.</string>
   <string name="btn_crypto_sign">Signieren</string>
   <string name="btn_encrypt">Verschlüsseln</string>
-  <string name="btn_decrypt">Entschlüsseln</string>
-  <string name="btn_verify">Verifizieren</string>
   <string name="unknown_crypto_signature_user_id">&lt;unbekannt&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME-Nachrichten werden noch nicht unterstützt.</string>
   <string name="attachment_encryption_unsupported">Achtung: Anhänge werden zur Zeit weder signiert noch verschlüsselt.</string>
   <string name="send_aborted">Senden abgebrochen.</string>
@@ -756,8 +742,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="confirm_discard_draft_message">Sind Sie sicher, dass Sie die Nachricht verwerfen möchten?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Speichern des Entwurfs verweigern</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Die Speicherung von als verschlüsselt markierten Entwürfen verweigern.</string>
-  <string name="continue_without_public_key_dlg_title">Ohne öffentlichen Schlüssel fortfahren?</string>
-  <string name="continue_without_public_key_instructions_fmt">Einer oder mehrere Empfänger besitzen keinen abgespeicherten öffentlichen Schlüssel. Fortfahren?</string>
   <string name="select_text_now">Text auswählen, um ihn zu kopieren.</string>
   <string name="dialog_confirm_delete_title">Löschen bestätigen</string>
   <string name="dialog_confirm_delete_message">Möchten Sie diese Nachricht löschen?</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b46e5aa73..873ac62c8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -48,7 +48,6 @@
   <string name="account_delete_dlg_instructions_fmt">Ο λογαριασμός \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφεί από το K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Όλα τα δεδομένα για το λογαριασμό \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφούν από το K-9 Mail, αλλά οι ρυθμίσεις του λογαριασμού θα διατηρηθούν.</string>
   <string name="account_clear_dlg_instructions_fmt">Όλα τα μηνύματα του λογαριασμού \'<xliff:g id="account">%s</xliff:g>\' θα διαγραφούν από το K-9 Mail, αλλά οι ρυθμίσεις του λογαριασμού θα διατηρηθούν.</string>
-  <string name="insufficient_apg_permissions">Το K-9 Mail δεν έχει δικαίωμα να προσπελαύνει πλήρως το APG. Επαναλάβετε την εγκατάσταση του K-9 Mail για να το διορθώσετε.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Δεν υπάρχει κατάλληλη εφαρμογή για να χειριστεί την εισαγωγή. Εγκαταστήστε μια εφαρμογή επόπτη αρχείων από το Android Market</string>
   <string name="open_market">Open Market</string>
@@ -99,8 +98,6 @@
   <string name="move_action">Μετακίνηση</string>
   <string name="single_message_options_action">Επιλογές μηνύματος…</string>
   <string name="refile_action">Επαναρχειοθέτηση…</string>
-  <string name="continue_action">Συνέχεια</string>
-  <string name="back_action">Πίσω</string>
   <string name="done_action">Συμπληρώθηκε</string>
   <string name="discard_action">Απόρριψη</string>
   <string name="save_draft_action">Αποθήκευση στα Πρόχειρα</string>
@@ -446,12 +443,6 @@
   <string name="account_settings_quote_prefix_label">Πρόθεμα κειμένου παράθεσης</string>
   <string name="account_settings_crypto">Κρυπτογραφία</string>
   <string name="account_settings_crypto_app">Πάροχος OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Κανένας</string>
-  <string name="account_settings_crypto_auto_signature">Αυτόματη πιστοποίηση</string>
-  <string name="account_settings_crypto_auto_signature_summary">Χρήση της διεύθυνσης του λογαριασμού για να βρεις το κλειδί της υπογραφής.</string>
-  <string name="account_settings_crypto_auto_encrypt">Αυτόματη κρυπτογράφηση</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Αυτόματη κρυπτογράφηση αν ένα δημόσιο κλειδί ταιριάζει σε παραλήπτη.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG μη εγκατεστημένο</string>
   <string name="account_settings_mail_check_frequency_label">Συχνότητα ενημέρωσης φακέλων</string>
   <string name="account_settings_storage_title">Αποθήκευση</string>
   <string name="account_settings_color_label">Χρώμα λογαριασμού</string>
@@ -715,15 +706,10 @@
   <string name="font_size_large">Μεγάλο</string>
   <string name="font_size_larger">Μεγαλύτερο</string>
   <string name="miscellaneous_preferences">Διάφορα</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Δεν βρέθηκε κατάλληλη εφαρμογή για αυτή την ενέργεια.</string>
-  <string name="error_apg_version_not_supported">Η εγκατεστημένη έκδοση APG δεν υποστηρίζεται.</string>
   <string name="btn_crypto_sign">Υπογραφή</string>
   <string name="btn_encrypt">Κρυπτογράφηση</string>
-  <string name="btn_decrypt">Αποκρυπτογράφηση</string>
-  <string name="btn_verify">Επιβεβαίωση</string>
   <string name="unknown_crypto_signature_user_id">&lt;άγνωστος&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Μηνύματα PGP/MIME δεν υποστηρίζονται ακόμη.</string>
   <string name="attachment_encryption_unsupported">Προειδοποίηση: τα συνημμένα δεν είναι υπογραμμένα ούτε κρυπτογραφημένα ακόμη.</string>
   <string name="send_aborted">Αποστολή ματαιώθηκε.</string>
@@ -733,8 +719,6 @@
   <string name="confirm_discard_draft_message">Είστε σίγουροι ότι θέλετε να απορρίψετε αυτό το μήνυμα;</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Άρνηση αποθήκευσης πρόχειρου μηνύματος</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Το πρόχειρο μήνυμα που σημάνθηκε ως κρυπτογραφημένο δεν θα αποθηκευτεί.</string>
-  <string name="continue_without_public_key_dlg_title">Συνέχεια χωρίς δημόσιο κλειδί;</string>
-  <string name="continue_without_public_key_instructions_fmt">Ένας ή περισσότεροι παραλήπτες δεν έχουν αποθηκευμένο δημόσιο κλειδί. Συνέχεια;</string>
   <string name="select_text_now">Επιλογή κειμένου για αντιγραφή</string>
   <string name="dialog_confirm_delete_title">Επιβεβαίωση διαγραφής</string>
   <string name="dialog_confirm_delete_message">Θέλετε να διαγράψετε αυτό το μήνυμα;</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fb1249ed1..203fd9edf 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -49,7 +49,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_delete_dlg_instructions_fmt">La cuenta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Los datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero se mantendrá su configuración.</string>
   <string name="account_clear_dlg_instructions_fmt">Todos los mensajes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero la configuración de la cuenta se mantendrá.</string>
-  <string name="insufficient_apg_permissions">K-9 no tiene permiso para acceder totalmente a APG, por favor, instale K-9 otra vez para arreglarlo.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Por favor instale un gestor de archivos para continuar con esta importación.</string>
   <string name="open_market">Abrir Google Play</string>
@@ -100,8 +99,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="move_action">Mover</string>
   <string name="single_message_options_action">Enviar…</string>
   <string name="refile_action">Archivar…</string>
-  <string name="continue_action">Continuar</string>
-  <string name="back_action">Atrás</string>
   <string name="done_action">Terminado</string>
   <string name="discard_action">Descartar</string>
   <string name="save_draft_action">Guardar como borrador</string>
@@ -445,12 +442,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="account_settings_quote_prefix_label">Prefijo de texto citado</string>
   <string name="account_settings_crypto">Cifrado</string>
   <string name="account_settings_crypto_app">Proveedor OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Ninguno</string>
-  <string name="account_settings_crypto_auto_signature">Firmar automáticamente</string>
-  <string name="account_settings_crypto_auto_signature_summary">Utilizar el correo para adivinar la clave de firma.</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto-cifrado</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Cifra automáticamente si la clave pública concuerda con un destinatario.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG no instalado</string>
   <string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string>
   <string name="account_settings_storage_title">Almacenamiento</string>
   <string name="account_settings_color_label">Color de la cuenta</string>
@@ -714,15 +705,10 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Muy Grande</string>
   <string name="miscellaneous_preferences">Varios</string>
-  <!--APG related-->
   <string name="error_activity_not_found">No existe aplicación para realizar esta acción.</string>
-  <string name="error_apg_version_not_supported">No se admite esta versión de APG.</string>
   <string name="btn_crypto_sign">Firmar</string>
   <string name="btn_encrypt">Cifrar</string>
-  <string name="btn_decrypt">Descifrar</string>
-  <string name="btn_verify">Verificar</string>
   <string name="unknown_crypto_signature_user_id">&lt;desconocido&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">El formato PGP/MIME no está admitido aún.</string>
   <string name="attachment_encryption_unsupported">Advertencia: los adjuntos no están firmados o cifrados.</string>
   <string name="send_aborted">Envío cancelado.</string>
@@ -732,8 +718,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="confirm_discard_draft_message">¿Está seguro de descartar este mensaje?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Rehusar guardar mensaje borrador.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Rehusar guardar mensaje borrador marcado como cifrado.</string>
-  <string name="continue_without_public_key_dlg_title">¿Continuar sin clave pública?</string>
-  <string name="continue_without_public_key_instructions_fmt">Uno o más destinatarios no tienen clave pública. ¿Continuar?</string>
   <string name="select_text_now">Seleccionar texto a copiar.</string>
   <string name="dialog_confirm_delete_title">Confirmar borrado</string>
   <string name="dialog_confirm_delete_message">¿Quiere borrar este mensaje?</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index feb7591e9..247ad5f89 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -50,7 +50,6 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="account_delete_dlg_instructions_fmt">Konto \"<xliff:g id="account">%s</xliff:g>\" eemaldatakse K-9 Mailist.</string>
   <string name="account_recreate_dlg_instructions_fmt">Kõik andmed \"<xliff:g id="account">%s</xliff:g>\" kustutatakse. Konto sätted sälitatakse.</string>
   <string name="account_clear_dlg_instructions_fmt">Sõnumite lokaalsed koopiad \"<xliff:g id="account">%s</xliff:g>\" eemaldatakse. Konto sätted säilitatakse.</string>
-  <string name="insufficient_apg_permissions">K-9 ei oma piisavalt lubasid Androidi täielikuks kasutamiseks. Palun installi K-9 uuesti.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Selle impordi jätkamiseks installi failihaldur.</string>
   <string name="open_market">Ava Play Store</string>
@@ -101,8 +100,6 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="move_action">Teisalda</string>
   <string name="single_message_options_action">Saada…</string>
   <string name="refile_action">Paiguta ümber…</string>
-  <string name="continue_action">Jätka</string>
-  <string name="back_action">Tagasi</string>
   <string name="done_action">Tehtud</string>
   <string name="discard_action">Loobu</string>
   <string name="save_draft_action">Salvesta mustandina</string>
@@ -445,7 +442,6 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="account_settings_folders">Kaustad</string>
   <string name="account_settings_crypto">Krüptograafia</string>
   <string name="account_settings_crypto_app">VabaPGP pakkuja</string>
-  <string name="account_settings_crypto_app_none">Puudub</string>
   <string name="account_settings_mail_check_frequency_label">Kausta pollimise sagedus</string>
   <string name="account_settings_storage_title">Mälu</string>
   <string name="account_settings_color_label">Konto värv</string>
@@ -703,14 +699,9 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="font_size_large">Suur</string>
   <string name="font_size_larger">Suurem</string>
   <string name="miscellaneous_preferences">Muu</string>
-  <!--APG related-->
-  <string name="error_apg_version_not_supported">Installitud APG versioon ei ole toetatud.</string>
   <string name="btn_crypto_sign">Allkirjasta</string>
   <string name="btn_encrypt">Krüpteeri</string>
-  <string name="btn_decrypt">Dekrüpteeri</string>
-  <string name="btn_verify">Kinnita</string>
   <string name="unknown_crypto_signature_user_id">&lt;tundmatu&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME ei ole praegu toetatud.</string>
   <string name="attachment_encryption_unsupported">Hoiatus: manused EI ole praegu allkirjastatud või krüpteeritud.</string>
   <string name="send_aborted">Saatmine katkestatud.</string>
@@ -720,8 +711,6 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="confirm_discard_draft_message">Oled kindel, et soovid sõnumist loobuda?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Keeldu mustandina salvestamisest.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Keeldu krüpteerituna märgitud sõnumite mustandina salvestamisest.</string>
-  <string name="continue_without_public_key_dlg_title">Jätka ilma avaliku võtmeta?</string>
-  <string name="continue_without_public_key_instructions_fmt">Ühel või mitmel adressaadil ei ole avalikku võtit. Jätka?</string>
   <string name="select_text_now">Vali kopeerimiseks teks.</string>
   <string name="dialog_confirm_delete_title">Kinnita kustutamine</string>
   <string name="dialog_confirm_delete_message">Kas soovid sõnumit kustutada?</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 7d2f46bd8..42b719d08 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -49,7 +49,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" kontua K-9 Mail-etik ezabatuko da.</string>
   <string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" kontuaren datu guztiak ezabatuko dira, Kontuaren ezarpenak mantenduko dira.</string>
   <string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"  kontuaren mezuen kopia lokalak ezabatuko dira. Kontuaren ezarpenak mantenduko dira.</string>
-  <string name="insufficient_apg_permissions">K-9k ez du APG erabiltzeko baimen osoa, K-9 berrinstalatu konpontzeko.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Inportazioarekin jarraitzeko instalatu fitxategi kudeatzeaile bat, mesedez.</string>
   <string name="open_market">Play Store-a ireki</string>
@@ -100,8 +99,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="move_action">Mugitu</string>
   <string name="single_message_options_action">Bidali…</string>
   <string name="refile_action">Artxibatu…</string>
-  <string name="continue_action">Jarraitu</string>
-  <string name="back_action">Atzera</string>
   <string name="done_action">Eginda</string>
   <string name="discard_action">Baztertu</string>
   <string name="save_draft_action">Zirriborroetan gorde</string>
@@ -436,12 +433,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="account_settings_quote_prefix_label">Aipamen testuaren aurrizkia</string>
   <string name="account_settings_crypto">Kriptografia</string>
   <string name="account_settings_crypto_app">OpenPGP hornitzailea</string>
-  <string name="account_settings_crypto_app_none">Batez</string>
-  <string name="account_settings_crypto_auto_signature">Sinadura automatikoa</string>
-  <string name="account_settings_crypto_auto_signature_summary">Kontuaren eposta helbidea erabili sinatzeko gakoa asmatzeko.</string>
-  <string name="account_settings_crypto_auto_encrypt">Zifraketa automatikoa</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Jasotzailearen gako publikoa badago automatikoki zifratu.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG ez dago instalatuta</string>
   <string name="account_settings_mail_check_frequency_label">Karpeta aztertzeko maiztasuna</string>
   <string name="account_settings_storage_title">Biltegia</string>
   <string name="account_settings_color_label">Kontuaren kolorea</string>
@@ -703,15 +694,10 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="font_size_large">Handia</string>
   <string name="font_size_larger">Handiagoa</string>
   <string name="miscellaneous_preferences">Bestelakoak</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Ez da honetarako aplikaziorik topatu.</string>
-  <string name="error_apg_version_not_supported">Instalatutako APG bertsioa ezin da erabili.</string>
   <string name="btn_crypto_sign">Sinatu</string>
   <string name="btn_encrypt">Zifratu</string>
-  <string name="btn_decrypt">Dezifratu</string>
-  <string name="btn_verify">Egiaztatu</string>
   <string name="unknown_crypto_signature_user_id">&lt;ezezaguna&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME mezurik oraindik ez.</string>
   <string name="attachment_encryption_unsupported">Kontuz: oraindik ez dira eranskinak zinatzen edo zifratzen.</string>
   <string name="send_aborted">Bidalketa ezeztatua.</string>
@@ -721,8 +707,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="confirm_discard_draft_message">Ziur mezu hau baztertu nahi duzula?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Zirriborroa gordetzea ukatu.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Zifratuko diren zirriborroak gordetzea ukatu.</string>
-  <string name="continue_without_public_key_dlg_title">Gako publikorik gabe jarraitu?</string>
-  <string name="continue_without_public_key_instructions_fmt">Jasotzaile bat edo gehiago ez dute gako publikorik. Jarraitu?</string>
   <string name="select_text_now">Kopiatuko den testua hautatu</string>
   <string name="dialog_confirm_delete_title">Ezabatzea baieztatu</string>
   <string name="dialog_confirm_delete_message">Mezu hau ezabatu nahi duzu?</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
old mode 100755
new mode 100644
index b4d1aca81..4f2020a55
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -51,7 +51,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_delete_dlg_instructions_fmt">Tili \"<xliff:g id="account">%s</xliff:g>\" poistetaan K-9 Mail -ohjelmasta.</string>
   <string name="account_recreate_dlg_instructions_fmt">Kaikki tilin \"<xliff:g id="account">%s</xliff:g>\" paikalliset tiedot poistetaan, mutta tilin asetukset säilyvät.</string>
   <string name="account_clear_dlg_instructions_fmt">Kaikki tilin \"<xliff:g id="account">%s</xliff:g>\" paikalliset viestit poistetaan, mutta tilin asetukset säilyvät.</string>
-  <string name="insufficient_apg_permissions">K-9:llä ei ole oikeuksia kaikkien APG:n ominaisuuksien käyttämiseen. Ole hyvä ja asenna K-9 uudelleen.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Tuontitoiminnon käsittelemiseen ei ole sopivaa sovellusta. Asenna Google Play Kaupasta jokin tiedostonhallintasovellus.</string>
   <string name="open_market">Avaa Play-kauppa</string>
@@ -102,8 +101,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="move_action">Siirrä</string>
   <string name="single_message_options_action">Viestin asetukset…</string>
   <string name="refile_action">Arkistoi…</string>
-  <string name="continue_action">Jatka</string>
-  <string name="back_action">Takaisin</string>
   <string name="done_action">Valmis</string>
   <string name="discard_action">Hylkää</string>
   <string name="save_draft_action">Tallenna luonnoksena</string>
@@ -464,12 +461,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="account_settings_quote_prefix_label">Lainauksen etuliite</string>
   <string name="account_settings_crypto">Salausmenetelmä</string>
   <string name="account_settings_crypto_app">OpenPGP</string>
-  <string name="account_settings_crypto_app_none">  Ei mitään</string>
-  <string name="account_settings_crypto_auto_signature">Automaattinen allekirjoitus</string>
-  <string name="account_settings_crypto_auto_signature_summary">Käytä tilin sähköpostiosoitetta allekirjoitusavaimen arvaamiseen.</string>
-  <string name="account_settings_crypto_auto_encrypt">Automaattinen salaus</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Salaa automaattisesti, jos julkinen avain täsmää vastaanottajan avaimeen.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG:tä ei ole asennettu</string>
   <string name="account_settings_mail_check_frequency_label">Kansioiden tarkistus</string>
   <string name="account_settings_storage_title">Tallennus</string>
   <string name="account_settings_color_label">Tilin väri</string>
@@ -740,15 +731,10 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="font_size_large">Suuri</string>
   <string name="font_size_larger">Suurin</string>
   <string name="miscellaneous_preferences">Muut</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Toiminnolle ei löytynyt sopivaa ohjelmaa.</string>
-  <string name="error_apg_version_not_supported">Asennettua APG-versiota ei tueta.</string>
   <string name="btn_crypto_sign">Allekirjoita</string>
   <string name="btn_encrypt">Salaa</string>
-  <string name="btn_decrypt">Pura salaus</string>
-  <string name="btn_verify">Vahvista</string>
   <string name="unknown_crypto_signature_user_id">&lt;tuntematon&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME-viestejä ei vielä tueta.</string>
   <string name="attachment_encryption_unsupported">Varoitus: Liitteitä ei allekirjoiteta tai salata tässä versiossa.</string>
   <string name="send_aborted">Lähetys keskeytetty.</string>
@@ -758,8 +744,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="confirm_discard_draft_message">Haluatko varmasti hylätä tämän viestin?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Hylkää luonnoksen tallennus.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Hylkää salatuksi merkityn luonnoksen tallennus.</string>
-  <string name="continue_without_public_key_dlg_title">Jatka ilman julkista avainta?</string>
-  <string name="continue_without_public_key_instructions_fmt">Yhdellä tai useammalla vastaanottajalla ei ole tallennettua julkista avainta. Jatketaanko?</string>
   <string name="select_text_now">Valitse kopioitava teksti.</string>
   <string name="dialog_confirm_delete_title">Vahvista poisto</string>
   <string name="dialog_confirm_delete_message">Haluatko poistaa tämän viestin?</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index bfc287af8..508723594 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -48,7 +48,6 @@ Veuillez envoyer les rapports de bogues, suggérer de nouvelles fonctions et pos
   <string name="account_delete_dlg_instructions_fmt">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» sera enlevé de K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Toutes les données de  «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» seront enlevées. Les paramètres du compte seront conservés.</string>
   <string name="account_clear_dlg_instructions_fmt">Les copies locales des messages de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» seront enlevées. Les paramètres du compte seront conservés.</string>
-  <string name="insufficient_apg_permissions">Courriel K-9 n\'a pas la permission d\'accéder complètement à APG. Veuillez réinstaller Courriel K-9 pour corriger cela.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Veuillez installer un gestionnaire de fichiers pour continuer cette importation.</string>
   <string name="open_market">Ouvrir le Google Play Store</string>
@@ -99,8 +98,6 @@ Veuillez envoyer les rapports de bogues, suggérer de nouvelles fonctions et pos
   <string name="move_action">Déplacer</string>
   <string name="single_message_options_action">Envoyer…</string>
   <string name="refile_action">Reclasser…</string>
-  <string name="continue_action">Continuer</string>
-  <string name="back_action">Retour</string>
   <string name="done_action">Terminé</string>
   <string name="discard_action">Abandonner</string>
   <string name="save_draft_action">Enregistrer comme brouillon</string>
@@ -462,12 +459,6 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="account_settings_quote_prefix_label">Préfixe de citation</string>
   <string name="account_settings_crypto">Cryptographie</string>
   <string name="account_settings_crypto_app">Fournisseur OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Aucune</string>
-  <string name="account_settings_crypto_auto_signature">Signature automatique</string>
-  <string name="account_settings_crypto_auto_signature_summary">Utiliser l\'adresse courriel du compte pour deviner la clé de signature</string>
-  <string name="account_settings_crypto_auto_encrypt">Chiffrement automatique</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Chiffrement défini automatiquement si une clé publique correspond à un destinataire.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG n\'est pas installé</string>
   <string name="account_settings_mail_check_frequency_label">Fréquence de vérification du dossier</string>
   <string name="account_settings_storage_title">Stockage</string>
   <string name="account_settings_color_label">Couleur du compte</string>
@@ -738,15 +729,10 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="font_size_large">Grand</string>
   <string name="font_size_larger">Plus grand</string>
   <string name="miscellaneous_preferences">Divers</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Aucune application adéquate n\'a été trouvée pour cette action.</string>
-  <string name="error_apg_version_not_supported">La version installée d\'APG n\'est pas prise en charge.</string>
   <string name="btn_crypto_sign">Signer</string>
   <string name="btn_encrypt">Chiffrer</string>
-  <string name="btn_decrypt">Déchiffrer</string>
-  <string name="btn_verify">Vérifier</string>
   <string name="unknown_crypto_signature_user_id">«\u00A0inconnu\u00A0»</string>
-  <string name="key_id">ID\u00A0: %s</string>
   <string name="pgp_mime_unsupported">Les messages PGP/MIME ne sont pas encore pris en charge</string>
   <string name="attachment_encryption_unsupported">Avertissement\u00A0: La signature et le chiffrement des pièces jointes ne sont PAS encore pris en charge.</string>
   <string name="send_aborted">Envoi interrompu.</string>
@@ -756,8 +742,6 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="confirm_discard_draft_message">Êtes-vous sûr de vouloir abandonner ce message\u00A0?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuser d\'enregistrer les brouillons.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuser d\'enregistrer un message marqué comme étant chiffré.</string>
-  <string name="continue_without_public_key_dlg_title">Continuer sans clé publique\u00A0?</string>
-  <string name="continue_without_public_key_instructions_fmt">Un ou plusieurs destinataires n\'ont pas de clé publique enregistrée. Continuer\u00A0?</string>
   <string name="select_text_now">Sélectionner le texte à copier</string>
   <string name="dialog_confirm_delete_title">Confirmer la suppression</string>
   <string name="dialog_confirm_delete_message">Voulez-vous supprimer ce message\u00A0?</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index df0051bb9..8424dbbc0 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -48,7 +48,6 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será eliminada do K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Todos os datos locais de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados. Os axustes da conta manteranse.</string>
   <string name="account_clear_dlg_instructions_fmt">As copias locais das mensaxes de \"<xliff:g id="account">%s</xliff:g>\" serán eliminadas. Manteranse os axustes da conta.</string>
-  <string name="insufficient_apg_permissions">K-9 non ten permiso para acceder por completo a APG; por favor, volve instalar K-9 para amañalo.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Por favor, selecciona un xestor de ficheiros para continuar con esta importación.</string>
   <string name="open_market">Abrir Play Store</string>
@@ -98,8 +97,6 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="forward_action">Reenviar</string>
   <string name="move_action">Mover</string>
   <string name="single_message_options_action">Enviar…</string>
-  <string name="continue_action">Continuar</string>
-  <string name="back_action">Volver</string>
   <string name="done_action">Feito</string>
   <string name="discard_action">Descartar</string>
   <string name="save_draft_action">Gardar como borrador</string>
@@ -440,12 +437,6 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="account_settings_quote_prefix_label">Prefixo da cita</string>
   <string name="account_settings_crypto">Cifraxe</string>
   <string name="account_settings_crypto_app">Provedor OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Ningunha</string>
-  <string name="account_settings_crypto_auto_signature">Asinar automaticamente</string>
-  <string name="account_settings_crypto_auto_signature_summary">Usar o enderezo electrónico para adiviñar a sinatura.</string>
-  <string name="account_settings_crypto_auto_encrypt">Cifraxe automática</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Cifrar automaticamente cando a chave pública coincida cun destinatario.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG non instalado</string>
   <string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string>
   <string name="account_settings_storage_title">Almacenamento</string>
   <string name="account_settings_color_label">Cor da conta</string>
@@ -694,15 +685,10 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Moi grande</string>
   <string name="miscellaneous_preferences">Miscelánea</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Non hai un aplicativo para executar esta acción.</string>
-  <string name="error_apg_version_not_supported">Non se admite a versión instalada de APG.</string>
   <string name="btn_crypto_sign">Asinar</string>
   <string name="btn_encrypt">Cifrar</string>
-  <string name="btn_decrypt">Descifrar</string>
-  <string name="btn_verify">Verificar</string>
   <string name="unknown_crypto_signature_user_id">&lt;descoñecido&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">As mensaxes PGP/MIME non se admiten aínda.</string>
   <string name="attachment_encryption_unsupported">Aviso: os anexos AÍNDA NON son asinados nin cifrados.</string>
   <string name="send_aborted">Envío cancelado.</string>
@@ -712,8 +698,6 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="confirm_discard_draft_message">Tes a certeza de querer descartar esta mensaxe?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Rexeitar gardar o borrador da mensaxe.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Rexeitar gardar o borrador dunha mensaxe marcada como cifrada.</string>
-  <string name="continue_without_public_key_dlg_title">Continuar sen chave pública?</string>
-  <string name="continue_without_public_key_instructions_fmt">Un ou máis destinatarios non teñen unha chave pública gardada. Desexas continuar?</string>
   <string name="select_text_now">Seleccionar texto para copiar.</string>
   <string name="dialog_confirm_delete_title">Confirmar borrado</string>
   <string name="dialog_confirm_delete_message">Queres eliminar esta mensaxe?</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 30bf874db..fe2827ced 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -48,7 +48,6 @@ Por favor, envía os erros que detectes, contribúe con novas funcionalidades e
   <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Os datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero manterase a súa Configuración</string>
   <string name="account_clear_dlg_instructions_fmt">Todas as mensaxes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero a Configuración da conta manterase</string>
-  <string name="insufficient_apg_permissions">K-9 non ten permiso para acceder totalmente a APG, por favor, instala K-9 otra vez ou arránxao</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Por favor, instala un xestor de ficheiros para continuar coa importación.</string>
   <string name="open_market">Abrir Play Store</string>
@@ -97,7 +96,6 @@ Por favor, envía os erros que detectes, contribúe con novas funcionalidades e
   <string name="forward_action">Reenviar</string>
   <string name="move_action">Mover</string>
   <string name="single_message_options_action">Enviar…</string>
-  <string name="continue_action">Continuar</string>
   <string name="done_action">Feito</string>
   <string name="discard_action">Descartar</string>
   <string name="save_draft_action">Gardar coma borrador</string>
@@ -393,9 +391,6 @@ Por favor, envía os erros que detectes, contribúe con novas funcionalidades e
   <string name="account_settings_quote_prefix_label">Prefixo de cita</string>
   <string name="account_settings_crypto">Cifrado</string>
   <string name="account_settings_crypto_app">OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Ningunha</string>
-  <string name="account_settings_crypto_auto_signature">Asinar automáticamente</string>
-  <string name="account_settings_crypto_auto_signature_summary">Usar o correo para adiviñar a chave de sinatura</string>
   <string name="account_settings_mail_check_frequency_label">Frecuencia de comprobación</string>
   <string name="account_settings_storage_title">Almacenamento</string>
   <string name="account_settings_color_label">Cor da conta</string>
@@ -640,15 +635,10 @@ Por favor, envía os erros que detectes, contribúe con novas funcionalidades e
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Moi Grande</string>
   <string name="miscellaneous_preferences">Varios</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Non existe aplicación para executar esta acción</string>
-  <string name="error_apg_version_not_supported">Non se soporta esta versión de APG</string>
   <string name="btn_crypto_sign">Asinar</string>
   <string name="btn_encrypt">Cifrar</string>
-  <string name="btn_decrypt">Descifrar</string>
-  <string name="btn_verify">Verificar</string>
   <string name="unknown_crypto_signature_user_id">&lt;descoñecido&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">O formato PGP/MIME non está soportado ainda</string>
   <string name="attachment_encryption_unsupported">Advertencia: os adxuntos non estan asinados ou cifrados</string>
   <string name="send_aborted">Envío cancelado.</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 092fa9786..01a09c822 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -49,7 +49,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="account_delete_dlg_instructions_fmt">A \"<xliff:g id="account">%s</xliff:g>\" fiók törölve a K9 Mail-ból.</string>
   <string name="account_recreate_dlg_instructions_fmt">Az összes üzenet, melléklet, mappa és beállításai törlődni fognak a \"<xliff:g id="account">%s</xliff:g>\" fiókból. A fiók beállításai megmaradnak.</string>
   <string name="account_clear_dlg_instructions_fmt">Minden levél törlődni fog a \"<xliff:g id="account">%s</xliff:g>\" fiókból, de a beállítások megmaradnak.</string>
-  <string name="insufficient_apg_permissions">A K-9-nek nincs hozzáférési joga az APG-hez. Kérem telepítse újra a K-9 Mail.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Az importálás folytatásához, telepítsen egy fájlkezelőt.</string>
   <string name="open_market">Play áruház megnyitása</string>
@@ -99,8 +98,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="forward_action">Továbbítás</string>
   <string name="move_action">Áthelyez</string>
   <string name="single_message_options_action">Küldés…</string>
-  <string name="continue_action">Folytatás</string>
-  <string name="back_action">Vissza</string>
   <string name="done_action">Rendben</string>
   <string name="discard_action">Mégsem</string>
   <string name="save_draft_action">Piszkozat</string>
@@ -429,11 +426,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="account_settings_quote_prefix_label">Idézett szöveg előtagja</string>
   <string name="account_settings_crypto">Titkosítás</string>
   <string name="account_settings_crypto_app">OpenPGP Provider</string>
-  <string name="account_settings_crypto_app_none">Nincs</string>
-  <string name="account_settings_crypto_auto_signature">Automatikus aláírás</string>
-  <string name="account_settings_crypto_auto_signature_summary">Használja az email címet a titkosítási kulcshoz</string>
-  <string name="account_settings_crypto_auto_encrypt">Automatikusan titkosított</string>
-  <string name="account_settings_crypto_apg_not_installed">Az APG nincs telepítve</string>
   <string name="account_settings_mail_check_frequency_label">Frissítés gyakorisága</string>
   <string name="account_settings_storage_title">Tárolás</string>
   <string name="account_settings_color_label">Fiók színe</string>
@@ -692,15 +684,10 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="font_size_large">Nagy</string>
   <string name="font_size_larger">Nagyobb</string>
   <string name="miscellaneous_preferences">Egyéb</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Nincs megfelelő alkalmazás ehhez a művelethez.</string>
-  <string name="error_apg_version_not_supported">A telepített APG verzió nem támogatott.</string>
   <string name="btn_crypto_sign">Aláírás</string>
   <string name="btn_encrypt">Titkosítás</string>
-  <string name="btn_decrypt">Dekódolás</string>
-  <string name="btn_verify">Ellenőrzés</string>
   <string name="unknown_crypto_signature_user_id">&lt;ismeretlen&gt;</string>
-  <string name="key_id">azonosító: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME üzenetek még nem támogatottak.</string>
   <string name="attachment_encryption_unsupported">Figyelem: a mellékletek nincsenek aláírva vagy nem titkosítottak.</string>
   <string name="send_aborted">Küldés megszakítva.</string>
@@ -710,8 +697,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="confirm_discard_draft_message">Valóban elveti az üzenetet?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Piszkozat mentésének elutasítása.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Titkosított piszkozatok mentésének elutasítása.</string>
-  <string name="continue_without_public_key_dlg_title">Folytatás nyilvános kulcs nélkül?</string>
-  <string name="continue_without_public_key_instructions_fmt">Egy vagy több címzettnek nincs elmentett nyilvános kulcsa. Folytatás?</string>
   <string name="select_text_now">Szöveg kijelölése.</string>
   <string name="dialog_confirm_delete_title">Törlés megerősítése</string>
   <string name="dialog_confirm_delete_message">Biztos hogy törli ezt a levelet?</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d577695c0..3ab66231f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -50,7 +50,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_delete_dlg_instructions_fmt">L\'account \"<xliff:g id="account">%s</xliff:g>\" sarà rimosso da K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Tutti i dati per \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
   <string name="account_clear_dlg_instructions_fmt">Le copie locali dei messaggi in \"<xliff:g id="account">%s</xliff:g>\" saranno rimosse da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>
-  <string name="insufficient_apg_permissions">K-9 non ha i permessi per accedere pienamente ad APG, installa di nuovo K-9 per risolvere il problema.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Installa un gestore file per procedere con questa importazione.</string>
   <string name="open_market">Apri il Play Store</string>
@@ -101,8 +100,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="move_action">Sposta</string>
   <string name="single_message_options_action">Opzioni invio…</string>
   <string name="refile_action">Riarchivia…</string>
-  <string name="continue_action">Continua</string>
-  <string name="back_action">Indietro</string>
   <string name="done_action">Fatto</string>
   <string name="discard_action">Ignora</string>
   <string name="save_draft_action">Salva come bozza</string>
@@ -463,12 +460,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="account_settings_quote_prefix_label">Prefisso testo citato</string>
   <string name="account_settings_crypto">Crittografia</string>
   <string name="account_settings_crypto_app">Fornitore OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Nessuno</string>
-  <string name="account_settings_crypto_auto_signature">Firma automatica</string>
-  <string name="account_settings_crypto_auto_signature_summary">Utilizza l\'indirizzo email dell\'account per dedurre la chiave di firma.</string>
-  <string name="account_settings_crypto_auto_encrypt">Cifratura automatica</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Cifra automaticamente se la chiave pubblica corrisponde al destinatario</string>
-  <string name="account_settings_crypto_apg_not_installed">APG non installato</string>
   <string name="account_settings_mail_check_frequency_label">Frequenza verifica cartelle</string>
   <string name="account_settings_storage_title">Archiviazione</string>
   <string name="account_settings_color_label">Colore dell\'account</string>
@@ -739,15 +730,10 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Più grande</string>
   <string name="miscellaneous_preferences">Varie</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Nessuna applicazione trovata per questa azione.</string>
-  <string name="error_apg_version_not_supported">La versione di APG installata non è supportata.</string>
   <string name="btn_crypto_sign">Firma</string>
   <string name="btn_encrypt">Cifra</string>
-  <string name="btn_decrypt">Decifra</string>
-  <string name="btn_verify">Verifica</string>
   <string name="unknown_crypto_signature_user_id">&lt;sconosciuto&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">I messaggi PGP/MIME non sono ancora supportati.</string>
   <string name="attachment_encryption_unsupported">Attenzione: gli allegati NON sono ancora firmati o cifrati.</string>
   <string name="send_aborted">Invio interrotto.</string>
@@ -757,8 +743,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="confirm_discard_draft_message">Sei sicuro di voler eliminare questo messaggio?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Impossibile salvare il messaggio in bozze.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Impossibile salvare il messaggio cifrato in bozze.</string>
-  <string name="continue_without_public_key_dlg_title">Vuoi continuare senza chiave pubblica?</string>
-  <string name="continue_without_public_key_instructions_fmt">Uno o più destinatari non hanno una chiave pubblica salvata. Vuoi continuare?</string>
   <string name="select_text_now">Seleziona il testo da copiare.</string>
   <string name="dialog_confirm_delete_title">Conferma l\'eliminazione</string>
   <string name="dialog_confirm_delete_message">Vuoi eliminare questo messaggio?</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 50cd657d7..aad42fc8a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -47,7 +47,6 @@
   <string name="account_delete_dlg_instructions_fmt">החשבון \"<xliff:g id="account">%s</xliff:g>\" ימחק מ K-9 Mail .</string>
   <string name="account_recreate_dlg_instructions_fmt">על הנתונים עבור \"<xliff:g id="account">%s</xliff:g>\" ימחקו מ K-9 Mail, אך הגדרות החשבון יישמרו.</string>
   <string name="account_clear_dlg_instructions_fmt">כל ההודעות ב \"<xliff:g id="account">%s</xliff:g>\" ימחקו מ K-9 Mail, אך הגדרות החשבון יישמרו.</string>
-  <string name="insufficient_apg_permissions">ל-K-9 אין הרשאה לגשת ל APG באופן מלא, התקן מחדש את K-9 כדי לתקן את זה.</string>
   <!--=== App Store-specific strings =======================================================-->
   <!--=== General strings ==================================================================-->
   <string name="app_authors_fmt">מפתחים: <xliff:g id="app_authors">%s</xliff:g></string>
@@ -83,7 +82,6 @@
   <string name="spam_action">דואר זבל</string>
   <string name="forward_action">קדימה</string>
   <string name="move_action">העבר</string>
-  <string name="continue_action">המשך</string>
   <string name="done_action">סיום</string>
   <string name="discard_action">השלך</string>
   <string name="save_draft_action">שמור כטיוטה</string>
@@ -364,7 +362,6 @@
   <string name="account_settings_quote_prefix_label">קידומת טקסט מצוטט</string>
   <string name="account_settings_crypto">הצפנה</string>
   <string name="account_settings_crypto_app">OpenPGP Provider</string>
-  <string name="account_settings_crypto_app_none">כלום</string>
   <string name="account_settings_storage_title">אחסון</string>
   <string name="account_settings_color_label">צבע חשבון</string>
   <string name="account_settings_color_summary">בחר את הצבע של החשבון המשומש בתיקייה וברשימת החשבונות</string>
@@ -579,13 +576,9 @@
   <string name="font_size_large">גדול</string>
   <string name="font_size_larger">ענק</string>
   <string name="miscellaneous_preferences">שונות</string>
-  <!--APG related-->
   <string name="error_activity_not_found">לא נמצא ישום שיכול לבצע פעולה זו.</string>
-  <string name="error_apg_version_not_supported">גרסת APG המותקנת אינה נתמכת.</string>
   <string name="btn_crypto_sign">חתום</string>
   <string name="btn_encrypt">הצפן</string>
-  <string name="btn_decrypt">פענח</string>
-  <string name="btn_verify">אמת</string>
   <string name="pgp_mime_unsupported">הודעות PGP /MIME אינן נתמכות עדיין.</string>
   <string name="attachment_encryption_unsupported">אזהרה: הקבצים המצורפים אינם חתומים או מוצפנים עדיין.</string>
   <string name="send_aborted">שליחה בוטלה.</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6fb953339..944684123 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -49,7 +49,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_delete_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" はK-9 Mailから削除されます。</string>
   <string name="account_recreate_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" のローカルのデータはK-9 Mailから削除されますが、アカウントの設定は残ります。</string>
   <string name="account_clear_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" のローカルにコピーしたメッセージはK-9 Mailから削除されますが、アカウントの設定は残ります。</string>
-  <string name="insufficient_apg_permissions">K-9 にAPGを利用するための権限がありません。これを解決するためには、K-9 を再インストールしてください。</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">設定をインポートするにはファイルマネージャをインストールしてください。</string>
   <string name="open_market">マーケット</string>
@@ -100,8 +99,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="move_action">移動</string>
   <string name="single_message_options_action">メッセージ操作…</string>
   <string name="refile_action">整理…</string>
-  <string name="continue_action">継続</string>
-  <string name="back_action">戻る</string>
   <string name="done_action">完了</string>
   <string name="discard_action">破棄</string>
   <string name="save_draft_action">下書きへ保存</string>
@@ -448,12 +445,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="account_settings_quote_prefix_label">引用記号</string>
   <string name="account_settings_crypto">暗号化</string>
   <string name="account_settings_crypto_app">OpenPGPの利用</string>
-  <string name="account_settings_crypto_app_none">なし</string>
-  <string name="account_settings_crypto_auto_signature">自動署名</string>
-  <string name="account_settings_crypto_auto_signature_summary">このアカウントのE-Mailアドレスから署名の鍵を自動的に決定する</string>
-  <string name="account_settings_crypto_auto_encrypt">自動暗号化</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">公開鍵が宛先と一致するなら自動的に暗号化する</string>
-  <string name="account_settings_crypto_apg_not_installed">APGがインストールされていません</string>
   <string name="account_settings_mail_check_frequency_label">同期フォルダの同期間隔</string>
   <string name="account_settings_storage_title">ストレージ</string>
   <string name="account_settings_color_label">アカウントの色</string>
@@ -717,15 +708,10 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="font_size_large">大</string>
   <string name="font_size_larger">極大</string>
   <string name="miscellaneous_preferences">その他</string>
-  <!--APG related-->
   <string name="error_activity_not_found">この操作のためのアプリケーションが見つかりません</string>
-  <string name="error_apg_version_not_supported">インストールされているAPGは、サポートされていないバージョンです</string>
   <string name="btn_crypto_sign">署名</string>
   <string name="btn_encrypt">暗号化</string>
-  <string name="btn_decrypt">復号化</string>
-  <string name="btn_verify">検証</string>
   <string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIMEで暗号化されたメッセージはまだサポートされていません</string>
   <string name="attachment_encryption_unsupported">警告：添付ファイルは署名も暗号化もされていません</string>
   <string name="send_aborted">送信中断</string>
@@ -735,8 +721,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="confirm_discard_draft_message">このメッセージを破棄しますか？</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">下書き保存の拒否</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">暗号化したメッセージは下書き保存できません</string>
-  <string name="continue_without_public_key_dlg_title">公開鍵なしでの続行</string>
-  <string name="continue_without_public_key_instructions_fmt">宛先の公開鍵を持っていませんが、続けますか？</string>
   <string name="select_text_now">選択したテキストをコピーします</string>
   <string name="dialog_confirm_delete_title">削除の確認</string>
   <string name="dialog_confirm_delete_message">このメッセージを削除しますか？</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bc94ed13f..36498b88d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -48,7 +48,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" 계정이 K-9에서 삭제됩니다.</string>
   <string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 데이터가 K-9에서 삭제됩니다. 하지만 계정 설정은 보존됩니다.</string>
   <string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 메일이 K-9에서 삭제됩니다. 하지만 계정 설정은 보존됩니다.</string>
-  <string name="insufficient_apg_permissions">K-9은 APG에 대한 완전한 접근 권한이 없습니다. 이를 고치려면 K-9를 재설치하십시오.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">가져오기에 적합한 애플리케이션이 없습니다. 구글 플레이 스토어에서 파일 관리자를 설치하십시오.</string>
   <string name="open_market">플레이 스토어 열기</string>
@@ -99,8 +98,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="move_action">이동</string>
   <string name="single_message_options_action">메시지 옵션…</string>
   <string name="refile_action">관리…</string>
-  <string name="continue_action">계속</string>
-  <string name="back_action">뒤로</string>
   <string name="done_action">완료</string>
   <string name="discard_action">버리기</string>
   <string name="save_draft_action">임시 보관함에 저장</string>
@@ -435,12 +432,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="account_settings_quote_prefix_label">본문 인용 앞 표시</string>
   <string name="account_settings_crypto">암호화 방법</string>
   <string name="account_settings_crypto_app">OpenPGP 제공자</string>
-  <string name="account_settings_crypto_app_none">없음</string>
-  <string name="account_settings_crypto_auto_signature">자동 서명</string>
-  <string name="account_settings_crypto_auto_signature_summary">계정의 이메일 주소를 통해 서명키를 추측합니다</string>
-  <string name="account_settings_crypto_auto_encrypt">자동 암호화</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">공용 키가 수신자와 일치하면 자동으로 암호화합니다</string>
-  <string name="account_settings_crypto_apg_not_installed">APG가 설치되지 않음</string>
   <string name="account_settings_mail_check_frequency_label">폴더 수신 빈도</string>
   <string name="account_settings_storage_title">저장 장치</string>
   <string name="account_settings_color_label">계정 색깔</string>
@@ -702,15 +693,10 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="font_size_large">크게</string>
   <string name="font_size_larger">더 크게</string>
   <string name="miscellaneous_preferences">기타 설정</string>
-  <!--APG related-->
   <string name="error_activity_not_found">이 작동에 대해 적절한 애플리케이션을 찾을 수 없습니다.</string>
-  <string name="error_apg_version_not_supported">설치된 APG 버전을 지원하지 않습니다.</string>
   <string name="btn_crypto_sign">서명</string>
   <string name="btn_encrypt">암호화</string>
-  <string name="btn_decrypt">복호화</string>
-  <string name="btn_verify">인증</string>
   <string name="unknown_crypto_signature_user_id">&lt;알 수 없음&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME 메시지는 아직 지원하지 않습니다.</string>
   <string name="attachment_encryption_unsupported">경고: 첨부 파일이 아직 암호화되지 않았습니다</string>
   <string name="send_aborted">보내기 실패.</string>
@@ -720,8 +706,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="confirm_discard_draft_message">메시지 작성을 취소하고 버리겠습니까?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">메시지를 저장할 수 없음</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">작성 중인 메시지가 암호화 표시되어 저장할 수 없습니다.</string>
-  <string name="continue_without_public_key_dlg_title">공용 암호 키 없이 계속</string>
-  <string name="continue_without_public_key_instructions_fmt">수신자 일부에게 공용 키가 없습니다. 계속하시겠습니까?</string>
   <string name="select_text_now">복사할 텍스트 선택</string>
   <string name="dialog_confirm_delete_title">삭제 확인</string>
   <string name="dialog_confirm_delete_message">이 메시지를 삭제하시겠습니까?</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index fe2f17162..63d846e0b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -49,7 +49,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="account_delete_dlg_instructions_fmt">Paskyra \"<xliff:g id="account">%s</xliff:g>\" bus pašalinta iš „K-9 Mail“.</string>
   <string name="account_recreate_dlg_instructions_fmt">Visi vietiniai \"<xliff:g id="account">%s</xliff:g>\" duomenys bus pašalinti. Paskyros nustatymai išliks.</string>
   <string name="account_clear_dlg_instructions_fmt">Vietinės  \"<xliff:g id="account">%s</xliff:g>\" laiškų kopijos bus pašalintos. Paskyros nustatymai išliks.</string>
-  <string name="insufficient_apg_permissions">K-9 neturi reikiamų leidimų pasiekti AGP, norėdami tai pataisyti iš naujo įdiekite K-9.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Norėdami tęsti importavimą turite įdiegti failų tvarkyklę.</string>
   <string name="open_market">Atverti „Play Store“</string>
@@ -100,8 +99,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="move_action">Perkelti</string>
   <string name="single_message_options_action">Siųsti…</string>
   <string name="refile_action">Refile…</string>
-  <string name="continue_action">Tęsti</string>
-  <string name="back_action">Atgal</string>
   <string name="done_action">Atlikta</string>
   <string name="discard_action">Atmesti</string>
   <string name="save_draft_action">Išsaugoti kaip juodraštį</string>
@@ -437,12 +434,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="account_settings_quote_prefix_label">Redaguojamo teksto priedėlis</string>
   <string name="account_settings_crypto">Šifravimas</string>
   <string name="account_settings_crypto_app">OpenPGP tiekėjas</string>
-  <string name="account_settings_crypto_app_none">Jokios</string>
-  <string name="account_settings_crypto_auto_signature">Automatinis pasirašymas</string>
-  <string name="account_settings_crypto_auto_signature_summary">Naudoti paskyros el. pašto adresą parašo rakto nustatymui.</string>
-  <string name="account_settings_crypto_auto_encrypt">Automatinis šifravimas</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Jei viešas raktas atitinka gavėją automatiškai įjungti šifravimą.</string>
-  <string name="account_settings_crypto_apg_not_installed">AGP neįdiegta</string>
   <string name="account_settings_mail_check_frequency_label">Aplanko tikrinimo dažnis</string>
   <string name="account_settings_storage_title">Saugykla</string>
   <string name="account_settings_color_label">Paskyros spalva</string>
@@ -704,15 +695,10 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="font_size_large">Didelis</string>
   <string name="font_size_larger">Didesnis</string>
   <string name="miscellaneous_preferences">Kita</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Šiai programai nerasta tinkamo veiksmo.</string>
-  <string name="error_apg_version_not_supported">Įdiegta APG versija nepalaikoma.</string>
   <string name="btn_crypto_sign">Pasirašyti</string>
   <string name="btn_encrypt">Šifruoti</string>
-  <string name="btn_decrypt">Iššifruoti</string>
-  <string name="btn_verify">Patikrinti</string>
   <string name="unknown_crypto_signature_user_id">&lt;nežinoma&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Kol kas PGP/MIME laiškai nepalaikomi.</string>
   <string name="attachment_encryption_unsupported">Įspėjimas: priedai NEpasirašyti ar nešifruoti.</string>
   <string name="send_aborted">Siuntimas nutrauktas.</string>
@@ -722,8 +708,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="confirm_discard_draft_message">Ar tikrai norite nepaisyti šio pranešimo?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Atsisakyta saugoti kaip juodraštį.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Atsisakyta saugoti juodraštį pažymėtą kaip šifruotą.</string>
-  <string name="continue_without_public_key_dlg_title">Tęsti be viešojo rakto?</string>
-  <string name="continue_without_public_key_instructions_fmt">Vienas ar keli gavėjai neturi išsaugoto viešojo rakto. Tęsti?</string>
   <string name="select_text_now">Pasirinkti tesktą kopijavimui.</string>
   <string name="dialog_confirm_delete_title">Patvirtinti šalinimą</string>
   <string name="dialog_confirm_delete_message">Ar tikrai norite pašalinti laišką?</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d986fffa1..1f938d02f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -51,7 +51,6 @@ Lūdzu sūtiet kļūdu ziņojumus, iesakiet uzlabojumus un uzdodiet jautājumus
   <string name="account_delete_dlg_instructions_fmt">Konts \"<xliff:g id="account">%s</xliff:g>\" tiks noņemts no K-9 Pasta.</string>
   <string name="account_recreate_dlg_instructions_fmt">Visi ierīcē saglabātie konta \"<xliff:g id="account">%s</xliff:g>\" dati tiks noņemti. Visi konta iestatījumi tiks saglabāti.</string>
   <string name="account_clear_dlg_instructions_fmt">Ierīcē saglabātās konta \"<xliff:g id="account">%s</xliff:g>\" vēstules tiks izdzēstas. Konta iestatījumi tiks saglabāti.</string>
-  <string name="insufficient_apg_permissions">K-9 nav pilnas pieejas APG. Lūdzu pārinstalējiet K-9, lai to atrisinātu.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Lūdzu, uzinstalējiet failu pārvaldnieku, lai turpinātu importēt datus.</string>
   <string name="open_market">Atvērt Play veikalu</string>
@@ -102,8 +101,6 @@ Lūdzu sūtiet kļūdu ziņojumus, iesakiet uzlabojumus un uzdodiet jautājumus
   <string name="move_action">Pārvietot</string>
   <string name="single_message_options_action">Sūtīt…</string>
   <string name="refile_action">Atkārtoti iearhivēt…</string>
-  <string name="continue_action">Turpināt</string>
-  <string name="back_action">Atpakaļ</string>
   <string name="done_action">Gatavs</string>
   <string name="discard_action">Izmest</string>
   <string name="save_draft_action">Saglabāt kā melnrakstu</string>
@@ -459,12 +456,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_quote_prefix_label">Citētā teksta galvene</string>
   <string name="account_settings_crypto">Šifrēšana</string>
   <string name="account_settings_crypto_app">OpenPGP nodrošinātājs</string>
-  <string name="account_settings_crypto_app_none">Neviens</string>
-  <string name="account_settings_crypto_auto_signature">Automātiska pierakstīšanās</string>
-  <string name="account_settings_crypto_auto_signature_summary">Izmantot šī konta pasta adresi, lai izvēlētos paraksta atslēgu</string>
-  <string name="account_settings_crypto_auto_encrypt">Automātiska šifrēšana</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automātiski ieslēgt šifrēšanu, ja publiskā atslēga sakrīt ar saņēmēju</string>
-  <string name="account_settings_crypto_apg_not_installed">APG nav instalēts</string>
   <string name="account_settings_mail_check_frequency_label">Mapes pārbaudes biežums</string>
   <string name="account_settings_storage_title">Krātuve</string>
   <string name="account_settings_color_label">Konta krāsa</string>
@@ -730,15 +721,10 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="font_size_large">Liels</string>
   <string name="font_size_larger">Lielāks</string>
   <string name="miscellaneous_preferences">Dažādi</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Šai darbībai nav atrasta atbilstoša aplikācija.</string>
-  <string name="error_apg_version_not_supported">Instalētā APG versija netiek atbalstīta.</string>
   <string name="btn_crypto_sign">Pierakstīties</string>
   <string name="btn_encrypt">Iešifrēt</string>
-  <string name="btn_decrypt">Atšifrēt</string>
-  <string name="btn_verify">Pārbaudīt</string>
   <string name="unknown_crypto_signature_user_id">&lt;nezināms&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME ziņas pagaidām netiek atbalstītas.</string>
   <string name="attachment_encryption_unsupported">Brīdinājums: pielikumi vēl NAV iezīmēti un iešifrēti.</string>
   <string name="send_aborted">Sūtīšana atcelta.</string>
@@ -748,8 +734,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="confirm_discard_draft_message">Vai tiešām izmest šo vēstuli?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Atteikties saglabāt vēstuli melnrakstos.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Atteikties saglabāt vēstuli, kura atzīmēta kā šifrēta, melnrakstos.</string>
-  <string name="continue_without_public_key_dlg_title">Turpināt bez publiskās atslēgas?</string>
-  <string name="continue_without_public_key_instructions_fmt">Vienam vai vairākiem saņēmējiem nav saglabāta publiskā atslēga. Vai turpināt?</string>
   <string name="select_text_now">Iezīmēt tekstu, lai kopētu.</string>
   <string name="dialog_confirm_delete_title">Apstiprināt dzēšanu</string>
   <string name="dialog_confirm_delete_message">Vai gribat izdzēst šo vēstuli?</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b0b738b2b..b2e90c59f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -50,7 +50,6 @@ Vennligst send feilmeldinger, forbedringer og still spørsmål hos
   <string name="account_delete_dlg_instructions_fmt">Kontoen \"<xliff:g id="account">%s</xliff:g>\" vil bli fjernet fra K-9 E-post</string>
   <string name="account_recreate_dlg_instructions_fmt">Alle lokale data for \"<xliff:g id="account">%s</xliff:g>\" vil bli fjernet. Kontoinnstillinger vil bli beholdt.</string>
   <string name="account_clear_dlg_instructions_fmt">Lokale kopier av meldinger i \"<xliff:g id="account">%s</xliff:g>\" vil bli fjernet. Kontoinnstillinger vil bli beholdt.</string>
-  <string name="insufficient_apg_permissions">K-9 har ikke rettighet til full tilgang til APG, vennligst reinstaller K-9 for å rette på det.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Du må ha installert en filbehandler for å importere.</string>
   <string name="open_market">Åpne Play-butikken</string>
@@ -101,8 +100,6 @@ Vennligst send feilmeldinger, forbedringer og still spørsmål hos
   <string name="move_action">Flytt</string>
   <string name="single_message_options_action">Send…</string>
   <string name="refile_action">Omorganiser …</string>
-  <string name="continue_action">Fortsett</string>
-  <string name="back_action">Tilbake</string>
   <string name="done_action">Ferdig</string>
   <string name="discard_action">Forkast</string>
   <string name="save_draft_action">Lagre som kladd</string>
@@ -433,10 +430,6 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="account_settings_folders">Mapper</string>
   <string name="account_settings_crypto">Kryptografi</string>
   <string name="account_settings_crypto_app">OpenPGP-leverandør</string>
-  <string name="account_settings_crypto_app_none">Ingen</string>
-  <string name="account_settings_crypto_auto_signature_summary">Benytt kontoens e-postadresse for å gjette signaturnøkkelen.</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto-krypter</string>
-  <string name="account_settings_crypto_apg_not_installed">APG ikke installert</string>
   <string name="account_settings_storage_title">Lagring</string>
   <string name="account_settings_color_label">Kontofarge</string>
   <string name="account_settings_mail_display_count_label">Lokal mappestørrelse</string>
@@ -660,15 +653,10 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="font_size_large">Stor</string>
   <string name="font_size_larger">Større</string>
   <string name="miscellaneous_preferences">Diverse</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Ingen egnede program ble funnet for denne handlingen.</string>
-  <string name="error_apg_version_not_supported">Den installerte APG-versjonen støttes ikke.</string>
   <string name="btn_crypto_sign">Signer</string>
   <string name="btn_encrypt">Krypter</string>
-  <string name="btn_decrypt">Dekrypter</string>
-  <string name="btn_verify">Bekreft</string>
   <string name="unknown_crypto_signature_user_id">&lt;ukjent&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME-meldinger støttes ikke enda.</string>
   <string name="attachment_encryption_unsupported">Advarsel: vedlegg er IKKE signert eller kryptert enda.</string>
   <string name="save_or_discard_draft_message_dlg_title">Lagre utkast?</string>
@@ -677,8 +665,6 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="confirm_discard_draft_message">Er du sikker på at du vil forkaste denne meldingen?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Nekt å lagre utkast.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Nekt å lagre utkast som er merket kryptert.</string>
-  <string name="continue_without_public_key_dlg_title">Fortsett uten offentlig nøkkel?</string>
-  <string name="continue_without_public_key_instructions_fmt">En eller flere mottakere har ikke en lagret offentlig nøkkel. Fortsett?</string>
   <string name="dialog_confirm_delete_title">Bekreft sletting</string>
   <string name="dialog_confirm_delete_message">Vil du slette denne meldingen?</string>
   <plurals name="dialog_confirm_delete_messages">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 67f743e6e..ec8ed7a95 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -49,7 +49,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="account_delete_dlg_instructions_fmt">De account \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Alle data voor \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail, maar account instellingen blijven behouden.</string>
   <string name="account_clear_dlg_instructions_fmt">Alle berichten in \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van  K-9 Mail, maar account instellingen blijven behouden.</string>
-  <string name="insufficient_apg_permissions">K-9 heeft geen volledige toegang tot APG, installeer K-9 opnieuw om dit te verhelpen.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Installeer een bestandsbeheer-app om verder te gaan met deze import.</string>
   <string name="open_market">Open Play Store</string>
@@ -100,8 +99,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="move_action">Verplaatsen</string>
   <string name="single_message_options_action">Verzend…</string>
   <string name="refile_action">Opnieuw opslaan…</string>
-  <string name="continue_action">Doorgaan</string>
-  <string name="back_action">Terug</string>
   <string name="done_action">Klaar</string>
   <string name="discard_action">Vergeten</string>
   <string name="save_draft_action">Opslaan als concept</string>
@@ -445,12 +442,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="account_settings_quote_prefix_label">Quote voorvoegsel</string>
   <string name="account_settings_crypto">Cryptografie</string>
   <string name="account_settings_crypto_app">OpenPGP Provider</string>
-  <string name="account_settings_crypto_app_none">Geen</string>
-  <string name="account_settings_crypto_auto_signature">Auto-ondertekenen</string>
-  <string name="account_settings_crypto_auto_signature_summary">Gebruik het e-mailadres van je account om de digitale sleutel te raden.</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto-versleutelen</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automatisch verslutelen aanzetten als een publieke sleutel overeenkomt met een ontvanger.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG niet geinstalleerd</string>
   <string name="account_settings_mail_check_frequency_label">Mappen poll controleer frequentie</string>
   <string name="account_settings_storage_title">Opslag</string>
   <string name="account_settings_color_label">Account kleur</string>
@@ -712,15 +703,10 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="font_size_large">Groot</string>
   <string name="font_size_larger">Groter</string>
   <string name="miscellaneous_preferences">Diversen</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Geen geschikte applicatie gevonden voor deze aktie.</string>
-  <string name="error_apg_version_not_supported">De geïnstalleerde APG versie wordt niet ondersteund.</string>
   <string name="btn_crypto_sign">Teken</string>
   <string name="btn_encrypt">Versleutelen</string>
-  <string name="btn_decrypt">Decoderen</string>
-  <string name="btn_verify">Bevestig</string>
   <string name="unknown_crypto_signature_user_id">&lt;onbekend&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME berichten zijn nog niet ondersteund.</string>
   <string name="attachment_encryption_unsupported">Waarschuwing: bijlage zijn nog niet ondertekend of versleuteld.</string>
   <string name="send_aborted">Verzenden geannuleerd.</string>
@@ -730,8 +716,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="confirm_discard_draft_message">Weet je zeker dat je dit bericht wilt afbreken?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Weiger klad-bericht op te slaan.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Weiger klad-bericht op te slaan als het versleuteld is.</string>
-  <string name="continue_without_public_key_dlg_title">Doorgaan zonder publieke sleutel?</string>
-  <string name="continue_without_public_key_instructions_fmt">Een of meerdere ontvangers hebben geen opgeslagen publieke sleutels. Doorgaan?</string>
   <string name="select_text_now">Selecteer tekst om te kopieren.</string>
   <string name="dialog_confirm_delete_title">Bevestig verwijderen</string>
   <string name="dialog_confirm_delete_message">Wil je dit bericht verwijderen?</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8975e5f24..c20525f89 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -49,7 +49,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="account_delete_dlg_instructions_fmt">Konto \"<xliff:g id="account">%s</xliff:g>\" zostanie usunięte z K-9.</string>
   <string name="account_recreate_dlg_instructions_fmt">Ustawienia konta \"<xliff:g id="account">%s</xliff:g>\" pozostaną bez zmian, niemniej wszystkie dane zostaną usunięte z bazy programu.</string>
   <string name="account_clear_dlg_instructions_fmt">Ustawienia konta \"<xliff:g id="account">%s</xliff:g>\" pozostaną bez zmian, niemniej wszystkie wiadomości zostaną usunięte z bazy programu.</string>
-  <string name="insufficient_apg_permissions">K-9 nie ma pełnego dostępu do APG, aby naprawić przeinstaluj K-9.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Brak aplikacji do obsługi plików importu. Zainastaluj jakąś aplikację z Google Play.</string>
   <string name="open_market">Otwórz Google Play</string>
@@ -100,8 +99,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="move_action">Przenieś</string>
   <string name="single_message_options_action">Wyślij…</string>
   <string name="refile_action">Operacje…</string>
-  <string name="continue_action">Kontynuuj</string>
-  <string name="back_action">Cofnij</string>
   <string name="done_action">Gotowe</string>
   <string name="discard_action">Usuń</string>
   <string name="save_draft_action">Zapisz jako szkic</string>
@@ -444,12 +441,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="account_settings_quote_prefix_label">Prefiks cytowania</string>
   <string name="account_settings_crypto">Kryptografia</string>
   <string name="account_settings_crypto_app">Dostawca OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Brak</string>
-  <string name="account_settings_crypto_auto_signature">Automatyczny podpis</string>
-  <string name="account_settings_crypto_auto_signature_summary">Użyj adresu email do zgadnięcia klucza podpisu</string>
-  <string name="account_settings_crypto_auto_encrypt">Automatyczne szyfrowanie</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automatycznie używaj szyfrowania, gdy publiczny klucz pasuje do odbiorcy</string>
-  <string name="account_settings_crypto_apg_not_installed">APG nie jest zainstalowane</string>
   <string name="account_settings_mail_check_frequency_label">Sprawdzanie konta</string>
   <string name="account_settings_storage_title">Przechowanie</string>
   <string name="account_settings_color_label">Kolor konta</string>
@@ -713,15 +704,10 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="font_size_large">Duża</string>
   <string name="font_size_larger">Wielka</string>
   <string name="miscellaneous_preferences">Różne</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Nie znaleiono odpowiedniej aplikacji.</string>
-  <string name="error_apg_version_not_supported">Zainstalowana wersja APG nie jest wspierana.</string>
   <string name="btn_crypto_sign">Podpisz</string>
   <string name="btn_encrypt">Szyfruj</string>
-  <string name="btn_decrypt">Deszyfruj</string>
-  <string name="btn_verify">Potwierdź</string>
   <string name="unknown_crypto_signature_user_id">&lt;nieznany&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Wiadomości PGP/MIME nie są jeszcze wspierane.</string>
   <string name="attachment_encryption_unsupported">Uwaga: załączniki nie są jeszcze podpisane i kodowane.</string>
   <string name="send_aborted">Anulowano.</string>
@@ -731,8 +717,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="confirm_discard_draft_message">Czy na pewno chcesz usunąć tą wiadomość?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Odrzuć zapisywanie szablonów.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Odrzuć zapisywanie szablonów oznaczonych jako zaszyfrowane.</string>
-  <string name="continue_without_public_key_dlg_title">Kontynuować bez klucza publicznego?</string>
-  <string name="continue_without_public_key_instructions_fmt">Jeden lub wiele odbiorców nie ma zapisanego klucza publicznego. Kontynuować?</string>
   <string name="select_text_now">Wybierz tekst do skopiowania.</string>
   <string name="dialog_confirm_delete_title">Potwiedź usunięcie</string>
   <string name="dialog_confirm_delete_message">Czy chcesz usunąć tą wiadomość?</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b65f683b2..bfcd29914 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -48,7 +48,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="account_delete_dlg_instructions_fmt">A conta \"<xliff:g id="account">%s</xliff:g>\" será removida do K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Todos os dados relativos à \"<xliff:g id="account">%s</xliff:g>\" serão removidos do K-9 Mail, mas as configurações da conta serão mantidas.</string>
   <string name="account_clear_dlg_instructions_fmt">Todas as mensagens de \"<xliff:g id="account">%s</xliff:g>\" serão removidas do K-9 Mail, mas as configurações da conta serão mantidas.</string>
-  <string name="insufficient_apg_permissions">K-9 não tem permissão total de acesso ao APG , favor reinstalar o K-9 para resolver.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Não existe um aplicativo adequado para a operação de importação. Instale um gerenciador de arquivos pela Google Play Store.</string>
   <string name="open_market">Abrir a Play Store</string>
@@ -99,8 +98,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="move_action">Mover</string>
   <string name="single_message_options_action">Opções de Mensagens…</string>
   <string name="refile_action">Rearquivar…</string>
-  <string name="continue_action">Continuar</string>
-  <string name="back_action">Voltar</string>
   <string name="done_action">Concluído</string>
   <string name="discard_action">Descartar</string>
   <string name="save_draft_action">Salvar como rascunho</string>
@@ -447,12 +444,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="account_settings_quote_prefix_label">Prefixo para textos</string>
   <string name="account_settings_crypto">Criptografia</string>
   <string name="account_settings_crypto_app">Provedor OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Nenhum</string>
-  <string name="account_settings_crypto_auto_signature">Auto-login</string>
-  <string name="account_settings_crypto_auto_signature_summary">Use o endereço de e-mail da conta para escolher assinatura.</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto-encriptar</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Definir encriptação automaticamente se uma chave pública corresponder à um destinatário.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG não instalado</string>
   <string name="account_settings_mail_check_frequency_label">Frequência de verificação de e-mail</string>
   <string name="account_settings_storage_title">Armazenamento</string>
   <string name="account_settings_color_label">Cor da conta</string>
@@ -713,15 +704,10 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="font_size_large">Maior</string>
   <string name="font_size_larger">Grande</string>
   <string name="miscellaneous_preferences">Diversos</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Nenhum aplicativo adequado para esta ação foi encontrado.</string>
-  <string name="error_apg_version_not_supported"> A versão da APG instalada não é suportada.</string>
   <string name="btn_crypto_sign">Entrar</string>
   <string name="btn_encrypt">Encriptar</string>
-  <string name="btn_decrypt">Decriptar</string>
-  <string name="btn_verify">Verificar</string>
   <string name="unknown_crypto_signature_user_id">&lt;desconhecido&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">mensagns PGP/MIME não são suportadas ainda.</string>
   <string name="attachment_encryption_unsupported">Aviso: os anexos não estão assinados ou encriptados ainda.</string>
   <string name="send_aborted">Envio abortado.</string>
@@ -731,8 +717,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="confirm_discard_draft_message">Tem certeza que deseja descartar esta mensagem?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Recusar salvamento de rascunho.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Recusar salvamento de rascunho de mensagem encriptada.</string>
-  <string name="continue_without_public_key_dlg_title">Continuar sem chave pública?</string>
-  <string name="continue_without_public_key_instructions_fmt">Um ou mais destinatários não tem chave pública. Continuar?</string>
   <string name="select_text_now">Selecione o texto para copiar.</string>
   <string name="dialog_confirm_delete_title">Confirmar exclusão</string>
   <string name="dialog_confirm_delete_message">Deseja mesmo excluir esta mensagem?</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0760d9ce1..1d0dba7f1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -50,7 +50,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_delete_dlg_instructions_fmt">Ящик \"<xliff:g id="account">%s</xliff:g>\" будет удалён из приложения</string>
   <string name="account_recreate_dlg_instructions_fmt">Все данные ящика \"<xliff:g id="account">%s</xliff:g>\" будут удалены, настройки сохранятся</string>
   <string name="account_clear_dlg_instructions_fmt">Локальные сообщения \"<xliff:g id="account">%s</xliff:g>\" будут удалены, настройки сохранятся</string>
-  <string name="insufficient_apg_permissions">Отсутствует полный доступ к APG. Переустановите K-9 Mail</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Для импорта необходим менеджер файлов</string>
   <string name="open_market">Google Play</string>
@@ -101,8 +100,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="move_action">Переместить</string>
   <string name="single_message_options_action">Отправить</string>
   <string name="refile_action">Смена папки</string>
-  <string name="continue_action">Далее</string>
-  <string name="back_action">Назад</string>
   <string name="done_action">Готово</string>
   <string name="discard_action">Отменить</string>
   <string name="save_draft_action">Черновик</string>
@@ -457,12 +454,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="account_settings_quote_prefix_label">Префикс цитаты</string>
   <string name="account_settings_crypto">Криптография</string>
   <string name="account_settings_crypto_app">Провайдер OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Нет</string>
-  <string name="account_settings_crypto_auto_signature">Автоподпись</string>
-  <string name="account_settings_crypto_auto_signature_summary">Выбирать закрытый ключ в зависимости от адреса ящика</string>
-  <string name="account_settings_crypto_auto_encrypt">Автошифрование</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Автоматически зашифровать сообщение при совпадении публичного ключа получателя</string>
-  <string name="account_settings_crypto_apg_not_installed">APG не установлен</string>
   <string name="account_settings_mail_check_frequency_label">Интервал проверки</string>
   <string name="account_settings_storage_title">Хранение</string>
   <string name="account_settings_color_label">Цвет</string>
@@ -728,15 +719,10 @@ K-9 Mail — почтовый клиент для Android.
   <string name="font_size_large">Огромный</string>
   <string name="font_size_larger">Гигантский</string>
   <string name="miscellaneous_preferences">Разное</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Подходящее приложение не найдено</string>
-  <string name="error_apg_version_not_supported">Установленная версия APG не поддерживается</string>
   <string name="btn_crypto_sign">Подписать</string>
   <string name="btn_encrypt">Шифровать</string>
-  <string name="btn_decrypt">Дешифр.</string>
-  <string name="btn_verify">Проверка</string>
   <string name="unknown_crypto_signature_user_id">&lt;н/д&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Сообщения PGP/MIME не поддерживаются</string>
   <string name="attachment_encryption_unsupported">Внимание: вложения НЕ подписываются и НЕ шифруются</string>
   <string name="send_aborted">Отправка отменена</string>
@@ -746,8 +732,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="confirm_discard_draft_message">Сообщение будет удалено. Продолжить?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Сбой сохранения</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Нельзя сохранить черновик зашифрованного сообщения</string>
-  <string name="continue_without_public_key_dlg_title">Нет открытого ключа</string>
-  <string name="continue_without_public_key_instructions_fmt">Один или несколько адресатов не предоставили открытый ключ. Продолжить?</string>
   <string name="select_text_now">Выберите текст длительным нажатием</string>
   <string name="dialog_confirm_delete_title">Удаление</string>
   <string name="dialog_confirm_delete_message">Сообщение будет удалено. Продолжить?</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e7c9828e4..c7143eb5b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -50,7 +50,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstránený z K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Všetky lokálne údaje pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú zachované.</string>
   <string name="account_clear_dlg_instructions_fmt">Všetky správy pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú však zachované.</string>
-  <string name="insufficient_apg_permissions">K-9 nemá povolenia k plnému prístupu k APG. Prosím, preinštalujte K-9 Mail na opravu tohto problému.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Nainštalujte, prosím, správcu súborov pre pokračovanie v tomto importovaní.</string>
   <string name="open_market">Otvoriť Obchod Play</string>
@@ -101,8 +100,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="move_action">Presunúť</string>
   <string name="single_message_options_action">Odoslať…</string>
   <string name="refile_action">Presmerovať…</string>
-  <string name="continue_action">Pokračovať</string>
-  <string name="back_action">Späť</string>
   <string name="done_action">Hotovo</string>
   <string name="discard_action">Zahodiť</string>
   <string name="save_draft_action">Uložiť ako koncept</string>
@@ -457,12 +454,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="account_settings_quote_prefix_label">Predpona citovaného textu</string>
   <string name="account_settings_crypto">Šifrovanie</string>
   <string name="account_settings_crypto_app">Poskytovateľ OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Žiadne</string>
-  <string name="account_settings_crypto_auto_signature">Automaticky podpisovať</string>
-  <string name="account_settings_crypto_auto_signature_summary">Používať e-mailovú adresu účtu pre uhádnutie podpisového kľúča</string>
-  <string name="account_settings_crypto_auto_encrypt">Automaticky šifrovať</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Automaticky zašifrovať, ak sa verejný kľúč zhoduje s príjemcom</string>
-  <string name="account_settings_crypto_apg_not_installed">APG nie je nainštalované</string>
   <string name="account_settings_mail_check_frequency_label">Frekvencia synchronizácie priečinkov</string>
   <string name="account_settings_storage_title">Ukladací priestor</string>
   <string name="account_settings_color_label">Farba účtu</string>
@@ -728,15 +719,10 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="font_size_large">Veľké</string>
   <string name="font_size_larger">Väčšie</string>
   <string name="miscellaneous_preferences">Rôzne</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Nebola nájdená žiadna vhodná aplikácia pre túto akciu.</string>
-  <string name="error_apg_version_not_supported">Nainštalovaná verzia APG nie je podporovaná.</string>
   <string name="btn_crypto_sign">Podpísať</string>
   <string name="btn_encrypt">Šifrovať</string>
-  <string name="btn_decrypt">Dešifrovať</string>
-  <string name="btn_verify">Overiť</string>
   <string name="unknown_crypto_signature_user_id">&lt;neznámy&gt;</string>
-  <string name="key_id">ID: %s</string>
   <string name="pgp_mime_unsupported">Formát správy PGP/MIME nie je zatiať podporovaný.</string>
   <string name="attachment_encryption_unsupported">Varovanie: prílohy zatiaľ nie je možné podpísať či šifrovať.</string>
   <string name="send_aborted">Odosielanie prerušené.</string>
@@ -746,8 +732,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="confirm_discard_draft_message">Ste si istý, že chcete zahodiť túto správu?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Odmietnuť uloženie konceptu správy.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Odmietnuť uloženie konceptu zašifrovanej správy.</string>
-  <string name="continue_without_public_key_dlg_title">Pokračovať bez verejného kľúča?</string>
-  <string name="continue_without_public_key_instructions_fmt">Jeden alebo viacerí príjemcovia nemajú uložený verejný kľúč. Pokračovať?</string>
   <string name="select_text_now">Vyberte text na kopírovanie.</string>
   <string name="dialog_confirm_delete_title">Potvrdiť vymazanie</string>
   <string name="dialog_confirm_delete_message">Chcete vymazať túto správu?</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 28649adde..2dff1941f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -49,7 +49,6 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_delete_dlg_instructions_fmt">Kontot \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas från K-9 E-post.</string>
   <string name="account_recreate_dlg_instructions_fmt">Alla lokala data för \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas. Kontoinställningar behålls.</string>
   <string name="account_clear_dlg_instructions_fmt">Alla lokalt lagrade meddelanden i \"<xliff:g id="account">%s</xliff:g>\" kommer att raderas. Kontoinställningar behålls.</string>
-  <string name="insufficient_apg_permissions">K-9 har inte behörighet att komma åt APG. Ominstallera K-9 för att åtgärda detta.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Installera en filhanterare för att fortsätta med denna import.</string>
   <string name="open_market">Öppna Play-butiken</string>
@@ -100,8 +99,6 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="move_action">Flytta</string>
   <string name="single_message_options_action">Skicka…</string>
   <string name="refile_action">Omarkivera…</string>
-  <string name="continue_action">Fortsätt</string>
-  <string name="back_action">Tillbaka</string>
   <string name="done_action">Färdig</string>
   <string name="discard_action">Kasta</string>
   <string name="save_draft_action">Spara som utkast</string>
@@ -449,12 +446,6 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="account_settings_quote_prefix_label">Citatprefix</string>
   <string name="account_settings_crypto">Kryptering</string>
   <string name="account_settings_crypto_app">OpenPGP-leverantör</string>
-  <string name="account_settings_crypto_app_none">Ingen</string>
-  <string name="account_settings_crypto_auto_signature">Auto-signera</string>
-  <string name="account_settings_crypto_auto_signature_summary">Använd kontots e-postadress för att gissa signaturnyckeln.</string>
-  <string name="account_settings_crypto_auto_encrypt">Auto-kryptera</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Kryptera automatiskt om en publik nyckel machar en mottagare.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG är inte installerat</string>
   <string name="account_settings_mail_check_frequency_label">Frekvens för att kontrollera mappar</string>
   <string name="account_settings_storage_title">Lagring</string>
   <string name="account_settings_color_label">Kontofärg</string>
@@ -718,15 +709,10 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="font_size_large">Större</string>
   <string name="font_size_larger">Störst</string>
   <string name="miscellaneous_preferences">Diverse</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Hittade ingen passande applikation för denna åtgärd.</string>
-  <string name="error_apg_version_not_supported">Den installerade versionen av APG stöds inte.</string>
   <string name="btn_crypto_sign">Signera</string>
   <string name="btn_encrypt">Kryptera</string>
-  <string name="btn_decrypt">Dekryptera</string>
-  <string name="btn_verify">Verifiera</string>
   <string name="unknown_crypto_signature_user_id">&lt;okänd&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">Det finns ännu inget stöd för brev med PGP/MIME.</string>
   <string name="attachment_encryption_unsupported">Varning: bilagor är INTE signerade eller krypterade än.</string>
   <string name="send_aborted">Sändningen avbruten.</string>
@@ -736,8 +722,6 @@ Anmäl fel, hjälp till med nya funktioner och ställ frågor på
   <string name="confirm_discard_draft_message">Är du säker på att du vill kasta detta meddelande?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Förhindra att brev sparas som utkast.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Förhindra att brev som markerats som krypterade sparas i utkast.</string>
-  <string name="continue_without_public_key_dlg_title">Fortsätta utan offentlig nyckel?</string>
-  <string name="continue_without_public_key_instructions_fmt">En eller flera mottagare saknar sparad offentlig nyckel. Fortsätta?</string>
   <string name="select_text_now">Välj text att kopiera.</string>
   <string name="dialog_confirm_delete_title">Bekräfta borttagning</string>
   <string name="dialog_confirm_delete_message">Vill du ta bort detta brev?</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 985f837e0..689006cc0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -49,7 +49,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="account_delete_dlg_instructions_fmt">Hesap \"<xliff:g id="account">%s</xliff:g>\" K-9 Mail\'den kaldırılacak.</string>
   <string name="account_recreate_dlg_instructions_fmt">Bütün bilgi \"<xliff:g id="account">%s</xliff:g>\" için K-9 Mail\'den kaldırılacak, fakat hesap ayarları korunacak.</string>
   <string name="account_clear_dlg_instructions_fmt">Bütün mesajlar \"<xliff:g id="account">%s</xliff:g>\" içinden ve K-9 Mail\'den kaldırılacak, fakat hesap ayarları korunacak.</string>
-  <string name="insufficient_apg_permissions">K-9 tamamiyle APG erişimine izin vermez, lütfen bunu düzeltmek için K-9\'i yeniden kurun.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">İçeri aktarma işlemini gerçekleştirebilecek uygun bir uygulama bulunamadı. Lütfen Google Play Store\'dan bir dosya yönetici uygulaması edinin.</string>
   <string name="open_market">Play Store\'u Aç</string>
@@ -100,8 +99,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="move_action">Taşı</string>
   <string name="single_message_options_action">Gönder…</string>
   <string name="refile_action">Refile…</string>
-  <string name="continue_action">Devam</string>
-  <string name="back_action">Geri</string>
   <string name="done_action">Tamam</string>
   <string name="discard_action">Çıkart</string>
   <string name="save_draft_action">Taslak olarak Kaydet</string>
@@ -448,12 +445,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="account_settings_quote_prefix_label">Alınan metinden önek</string>
   <string name="account_settings_crypto">Şifreleme</string>
   <string name="account_settings_crypto_app">OpenPGP Sağlayıcı</string>
-  <string name="account_settings_crypto_app_none">Hiçbiri</string>
-  <string name="account_settings_crypto_auto_signature">Otomatik oturum açma</string>
-  <string name="account_settings_crypto_auto_signature_summary">İmza anahtarını tahmin etmek için hesapların e-posta adreslerini kullan.</string>
-  <string name="account_settings_crypto_auto_encrypt">Otomatik şifrele</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Eğer paylaşılan anahtar alıcınınkine eşleşiyorsa otomatik şifrele.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG yüklü değil</string>
   <string name="account_settings_mail_check_frequency_label">Klasör veri toplama sıklığı</string>
   <string name="account_settings_storage_title">Depolama</string>
   <string name="account_settings_color_label">Hesap rengi</string>
@@ -717,15 +708,10 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="font_size_large">Büyük</string>
   <string name="font_size_larger">Daha büyük</string>
   <string name="miscellaneous_preferences">Çeşitli</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Bu eylem için uygun program bulunamadı.</string>
-  <string name="error_apg_version_not_supported">Kurulu APG versiyon desteklenmiyor.</string>
   <string name="btn_crypto_sign">İşaret</string>
   <string name="btn_encrypt">Şifrele</string>
-  <string name="btn_decrypt">Çöz</string>
-  <string name="btn_verify">Doğrula</string>
   <string name="unknown_crypto_signature_user_id">&lt;bilinmiyor&gt;</string>
-  <string name="key_id">no: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME mesajları henüz desteklenmiyor.</string>
   <string name="attachment_encryption_unsupported">Uyarı: Ekler henüz işaretli veya şifreli değil.</string>
   <string name="send_aborted">Gönderme iptal edildi.</string>
@@ -735,8 +721,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="confirm_discard_draft_message">Bu mesajı silmek istediğinizden emin misiniz?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Taslak mesajını kaydetmeyi önle.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Şifreli mesajın taslağını kaydetmeyi önle.</string>
-  <string name="continue_without_public_key_dlg_title">Paylaşılmış anahtarsız devam et?</string>
-  <string name="continue_without_public_key_instructions_fmt">Bir veya daha fazla alıcının paylaşılmış bir anahtarı bulunmuyor. Devam et?</string>
   <string name="select_text_now">Kopyalamak için metni seç.</string>
   <string name="dialog_confirm_delete_title">Silmeyi onayla</string>
   <string name="dialog_confirm_delete_message">Bu mesajı silmek istiyor musunuz?</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8530cd3b8..2e00ef7c2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -49,7 +49,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_delete_dlg_instructions_fmt">Обліковий запис \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail.</string>
   <string name="account_recreate_dlg_instructions_fmt">Усі дані \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail, але налаштування облікового запису будуть збережені.</string>
   <string name="account_clear_dlg_instructions_fmt">Усі повідомлення у \"<xliff:g id="account">%s</xliff:g>\" буде вилучено з K-9 Mail, але налаштування облікового запису будуть збережені.</string>
-  <string name="insufficient_apg_permissions">K-9 не має дозволу для повного доступу до APG, перевстановіть K-9 для виправлення.</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">Немає відповідної програми для завершення операції імпорту. Будь ласка інсталюйте файловий менеджер з Play Google.</string>
   <string name="open_market">Відкрити Play Google</string>
@@ -99,8 +98,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="forward_action">Переслати</string>
   <string name="move_action">Перемістити</string>
   <string name="single_message_options_action">Надіслати</string>
-  <string name="continue_action">Продовжити</string>
-  <string name="back_action">Назад</string>
   <string name="done_action">Готово</string>
   <string name="discard_action">Відкинути зміни</string>
   <string name="save_draft_action">Зберегти як чернетку</string>
@@ -435,12 +432,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="account_settings_quote_prefix_label">Префікс цитованого тексту</string>
   <string name="account_settings_crypto">Шифрування</string>
   <string name="account_settings_crypto_app">OpenPGP</string>
-  <string name="account_settings_crypto_app_none">Ні</string>
-  <string name="account_settings_crypto_auto_signature">Автопідпис</string>
-  <string name="account_settings_crypto_auto_signature_summary">Використовувати електронну адресу для формування ключа підпису.</string>
-  <string name="account_settings_crypto_auto_encrypt">Автошифрування</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">Автоматична установка шифрування, якщо співпадає відкритий ключ одержувача.</string>
-  <string name="account_settings_crypto_apg_not_installed">APG не встановлено</string>
   <string name="account_settings_mail_check_frequency_label">Частота опитування папок</string>
   <string name="account_settings_storage_title">Пам’ять</string>
   <string name="account_settings_color_label">Колір облікового запису</string>
@@ -701,15 +692,10 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="font_size_large">Великий</string>
   <string name="font_size_larger">Найбільший</string>
   <string name="miscellaneous_preferences">Різне</string>
-  <!--APG related-->
   <string name="error_activity_not_found">Відсутня програма для цієї дії.</string>
-  <string name="error_apg_version_not_supported">Встановлена версія APG не підтримується.</string>
   <string name="btn_crypto_sign">Підписати</string>
   <string name="btn_encrypt">Зашифрувати</string>
-  <string name="btn_decrypt">Розшифрувати</string>
-  <string name="btn_verify">Перевірити</string>
   <string name="unknown_crypto_signature_user_id">&lt;невідомий&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">PGP/MIME повідомлення ще не підтримуються.</string>
   <string name="attachment_encryption_unsupported">Увага: вкладення ще не підписані та не зашифровані.</string>
   <string name="send_aborted">Надсилання скасовано.</string>
@@ -719,8 +705,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="confirm_discard_draft_message">Ви дійсно хочете відмінити це повідомлення?</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Скасувати збереження чернетки повідомлення.</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Скасувати збереження чернетки повідомлення, позначеного як зашифроване.</string>
-  <string name="continue_without_public_key_dlg_title">Продовжити без публічного ключа?</string>
-  <string name="continue_without_public_key_instructions_fmt">Один чи більше одержувачів не мають публічного ключа. Продовжити?</string>
   <string name="select_text_now">Виберіть текст для копіювання.</string>
   <string name="dialog_confirm_delete_title">Підтвердіть вилучення</string>
   <string name="dialog_confirm_delete_message">Ви хочете вилучити це повідомлення?</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c1a82d923..9e0dba3c5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -48,7 +48,6 @@ K-9改进的功能包括：
   <string name="account_delete_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”将从K-9 Mail中删除。</string>
   <string name="account_recreate_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”的全部数据将从K-9 Mail中删除，但是账户设置将保留。</string>
   <string name="account_clear_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”中的全部邮件将从K-9 Mail中删除，但是账户设置将保留。</string>
-  <string name="insufficient_apg_permissions">K-9没有被允许完全访问APG，请重新安装K-9以便修复这一问题。</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">要继续导入，请先安装一款文件管理器。</string>
   <string name="open_market">打开 Play Store</string>
@@ -99,8 +98,6 @@ K-9改进的功能包括：
   <string name="move_action">移动</string>
   <string name="single_message_options_action">发送…</string>
   <string name="refile_action">重新归档…</string>
-  <string name="continue_action">继续</string>
-  <string name="back_action">返回</string>
   <string name="done_action">完成</string>
   <string name="discard_action">忽略</string>
   <string name="save_draft_action">保存为草稿</string>
@@ -447,12 +444,6 @@ K-9改进的功能包括：
   <string name="account_settings_quote_prefix_label">引用文本前缀</string>
   <string name="account_settings_crypto">加密</string>
   <string name="account_settings_crypto_app">OpenPGP 提供者</string>
-  <string name="account_settings_crypto_app_none">无</string>
-  <string name="account_settings_crypto_auto_signature">自动签名</string>
-  <string name="account_settings_crypto_auto_signature_summary">使用账户的电子邮件地址自动猜测签名密钥。</string>
-  <string name="account_settings_crypto_auto_encrypt">自动加密</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">如果找到收件人的公钥，则自动加密。</string>
-  <string name="account_settings_crypto_apg_not_installed">未安装 APG</string>
   <string name="account_settings_mail_check_frequency_label">文件夹检查频率</string>
   <string name="account_settings_storage_title">存储</string>
   <string name="account_settings_color_label">账户颜色</string>
@@ -716,15 +707,10 @@ K-9改进的功能包括：
   <string name="font_size_large">大</string>
   <string name="font_size_larger">更大</string>
   <string name="miscellaneous_preferences">杂项</string>
-  <!--APG related-->
   <string name="error_activity_not_found">没有找到可以用于这一操作的程序。</string>
-  <string name="error_apg_version_not_supported">不支持所安装版本的APG。</string>
   <string name="btn_crypto_sign">签名</string>
   <string name="btn_encrypt">加密</string>
-  <string name="btn_decrypt">解密</string>
-  <string name="btn_verify">验证</string>
   <string name="unknown_crypto_signature_user_id">&lt;未知&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">暂时还不支持PGP/MIME邮件。</string>
   <string name="attachment_encryption_unsupported">警告：附件还 *没有* 被签名或者加密。</string>
   <string name="send_aborted">发送操作已经取消。</string>
@@ -734,8 +720,6 @@ K-9改进的功能包括：
   <string name="confirm_discard_draft_message">确定舍弃该邮件？</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">拒绝保存草稿</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">拒绝保存标记为已加密的草稿</string>
-  <string name="continue_without_public_key_dlg_title">没有公钥，继续？</string>
-  <string name="continue_without_public_key_instructions_fmt">某些收件人没有保存的公钥，继续？</string>
   <string name="select_text_now">选择需要拷贝的文本。</string>
   <string name="dialog_confirm_delete_title">删除确认</string>
   <string name="dialog_confirm_delete_message">你确定要删除这封邮件么？</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index cc8300870..982b26705 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -21,7 +21,6 @@
   <string name="account_delete_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」將從K-9 Mail中刪除。</string>
   <string name="account_recreate_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」的所有相關資料將從K-9 Mail中刪除，僅保留帳戶設定。</string>
   <string name="account_clear_dlg_instructions_fmt">帳戶「<xliff:g id="account">%s</xliff:g>」的所有郵件將從K-9 Mail中刪除，僅保留帳戶設定。</string>
-  <string name="insufficient_apg_permissions">K-9沒有被允許存取APG，請重新安裝K-9嘗試修復問題。</string>
   <!--=== App Store-specific strings =======================================================-->
   <string name="import_dialog_error_message">沒有找到合適的應用程式來處理匯入操作。請從GOOGLE PLAY商店下載安裝檔案管理應用程式。</string>
   <string name="open_market">開啟GOOGLE PLAY商店</string>
@@ -71,8 +70,6 @@
   <string name="forward_action">轉寄</string>
   <string name="move_action">移動</string>
   <string name="single_message_options_action">訊息選項…</string>
-  <string name="continue_action">繼續</string>
-  <string name="back_action">返回</string>
   <string name="done_action">完成</string>
   <string name="discard_action">忽略</string>
   <string name="save_draft_action">儲存為草稿</string>
@@ -407,12 +404,6 @@
   <string name="account_settings_quote_prefix_label">引用本文前綴</string>
   <string name="account_settings_crypto">加密</string>
   <string name="account_settings_crypto_app">OpenPGP提供者</string>
-  <string name="account_settings_crypto_app_none">無</string>
-  <string name="account_settings_crypto_auto_signature">自動簽名</string>
-  <string name="account_settings_crypto_auto_signature_summary">使用帳戶電子郵件回覆，則自動檢查比對簽名金鑰。</string>
-  <string name="account_settings_crypto_auto_encrypt">自動加密</string>
-  <string name="account_settings_crypto_auto_encrypt_summary">當檢查比對收件人公鑰符合時，自動進行加密。</string>
-  <string name="account_settings_crypto_apg_not_installed">未安裝APG</string>
   <string name="account_settings_mail_check_frequency_label">上層信件匣檢查頻率</string>
   <string name="account_settings_storage_title">帳戶儲存</string>
   <string name="account_settings_color_label">帳戶顏色</string>
@@ -674,15 +665,10 @@
   <string name="font_size_large">大</string>
   <string name="font_size_larger">最大</string>
   <string name="miscellaneous_preferences">偏好設定</string>
-  <!--APG related-->
   <string name="error_activity_not_found">沒有找到可以用於此操作的程式。</string>
-  <string name="error_apg_version_not_supported">尚未支援所安裝的APG版本。</string>
   <string name="btn_crypto_sign">簽名</string>
   <string name="btn_encrypt">加密</string>
-  <string name="btn_decrypt">解密</string>
-  <string name="btn_verify">驗證</string>
   <string name="unknown_crypto_signature_user_id">&lt;未知&gt;</string>
-  <string name="key_id">id: %s</string>
   <string name="pgp_mime_unsupported">暫時還沒有支援PGP/MIME郵件。</string>
   <string name="attachment_encryption_unsupported">警告：附件還 *沒有* 被簽名或者加密。</string>
   <string name="send_aborted">寄送操作已經取消。</string>
@@ -692,8 +678,6 @@
   <string name="confirm_discard_draft_message">是否確定放棄儲存目前的郵件？</string>
   <string name="refuse_to_save_draft_marked_encrypted_dlg_title">不要儲存為草稿信件</string>
   <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">被加密的信件不會儲存到草稿信件匣.</string>
-  <string name="continue_without_public_key_dlg_title">沒有取得公開金鑰，確認繼續執行？</string>
-  <string name="continue_without_public_key_instructions_fmt">某些收件人沒有找到儲存的公開金鑰，是否確認繼續？</string>
   <string name="select_text_now">選擇需要複製的文字內容。</string>
   <string name="dialog_confirm_delete_title">刪除確認</string>
   <string name="dialog_confirm_delete_message">你確定要刪除這封郵件？</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d7bca28b8..37771b244 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -63,7 +63,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail.</string>
     <string name="account_recreate_dlg_instructions_fmt">All local data for \"<xliff:g id="account">%s</xliff:g>\" will be removed. Account settings will be retained.</string>
     <string name="account_clear_dlg_instructions_fmt">Local copies of messages in \"<xliff:g id="account">%s</xliff:g>\" will be removed. Account settings will be retained.</string>
-    <string name="insufficient_apg_permissions">K-9 doesn\'t have permission to access APG fully, please reinstall K-9 to fix that.</string>
 
 
 
@@ -130,8 +129,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="move_action">Move</string>
     <string name="single_message_options_action">Send…</string>
     <string name="refile_action">Refile…</string>
-    <string name="continue_action">Continue</string>
-    <string name="back_action">Back</string>
     <string name="done_action">Done</string>
     <string name="discard_action">Discard</string>
     <string name="save_draft_action">Save as draft</string>
@@ -563,12 +560,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_settings_quote_prefix_label">Quoted text prefix</string>
     <string name="account_settings_crypto">Cryptography</string>
     <string name="account_settings_crypto_app">OpenPGP Provider</string>
-    <string name="account_settings_crypto_app_none">None</string>
-    <string name="account_settings_crypto_auto_signature">Auto-sign</string>
-    <string name="account_settings_crypto_auto_signature_summary">Use the account\'s email address to guess the signature key.</string>
-    <string name="account_settings_crypto_auto_encrypt">Auto-encrypt</string>
-    <string name="account_settings_crypto_auto_encrypt_summary">Automatically set encrypt if a public key matches a recipient.</string>
-    <string name="account_settings_crypto_apg_not_installed">APG not installed</string>
     <string name="account_settings_no_openpgp_provider_installed">No OpenPGP Provider installed</string>
 
     <string name="account_settings_mail_check_frequency_label">Folder poll frequency</string>
@@ -909,15 +900,10 @@ Please submit bug reports, contribute new features and ask questions at
 
     <string name="miscellaneous_preferences">Miscellaneous</string>
 
-    <!-- APG related -->
     <string name="error_activity_not_found">No suitable application for this action found.</string>
-    <string name="error_apg_version_not_supported">The installed APG version is not supported.</string>
     <string name="btn_crypto_sign">Sign</string>
     <string name="btn_encrypt">Encrypt</string>
-    <string name="btn_decrypt">Decrypt</string>
-    <string name="btn_verify">Verify</string>
     <string name="unknown_crypto_signature_user_id">&lt;unknown&gt;</string>
-    <string name="key_id">id: %s</string>
     <string name="pgp_mime_unsupported">PGP/MIME messages are not supported yet.</string>
     <string name="attachment_encryption_unsupported">Warning: attachments are NOT signed or encrypted yet.</string>
     <string name="send_aborted">Send aborted.</string>
@@ -931,9 +917,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuse to save draft message.</string>
     <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuse to save draft message marked encrypted.</string>
 
-    <string name="continue_without_public_key_dlg_title">Continue without public key?</string>
-    <string name="continue_without_public_key_instructions_fmt">One or more recipients do not have a saved public key. Continue?</string>
-
     <string name="select_text_now">Select text to copy.</string>
 
     <string name="dialog_confirm_delete_title">Confirm deletion</string>