diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index 0ce5fe274..e384897e0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui;
 
 import android.content.Intent;
 import android.graphics.Typeface;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
@@ -57,7 +56,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
     static final int ID_SETTINGS = 6;
     static final int ID_HELP = 7;
     static final int ID_SHOP = 8;
-    static final int ID_AUTOCRYPT = 9;
 
     // both of these are used for instrumentation testing only
     public static final String EXTRA_SKIP_FIRST_TIME = "skip_first_time";
@@ -97,10 +95,7 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
                                 .withIdentifier(ID_TRANSFER).withSelectable(false),
                         new DividerDrawerItem(),
                         new PrimaryDrawerItem().withName(R.string.menu_preferences).withIcon(GoogleMaterial.Icon.gmd_settings).withIdentifier(ID_SETTINGS).withSelectable(false),
-                        new PrimaryDrawerItem().withName(R.string.menu_help).withIcon(CommunityMaterial.Icon.cmd_help_circle).withIdentifier(ID_HELP).withSelectable(false),
-                        new DividerDrawerItem(),
-                        new PrimaryDrawerItem().withName(R.string.nav_autocrypt).withIcon(GoogleMaterial.Icon.gmd_blur_on)
-                                .withTypeface(Typeface.DEFAULT_BOLD).withSelectable(false).withIdentifier(ID_AUTOCRYPT)
+                        new PrimaryDrawerItem().withName(R.string.menu_help).withIcon(CommunityMaterial.Icon.cmd_help_circle).withIdentifier(ID_HELP).withSelectable(false)
                 )
                 .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
                     @Override
@@ -133,9 +128,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
                                 case ID_SHOP:
                                     onShopSelected();
                                     break;
-                                case ID_AUTOCRYPT:
-                                    onAutocryptSelected();
-                                    break;
                             }
                             if (intent != null) {
                                 MainActivity.this.startActivity(intent);
@@ -267,13 +259,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
         setFragment(frag);
     }
 
-    private void onAutocryptSelected() {
-        String url = "https://addons.thunderbird.net/en-US/thunderbird/addon/autocrypt/";
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(url));
-        startActivity(intent);
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // add the values which need to be saved from the drawer to the bundle
diff --git a/OpenKeychain/src/main/res/values-ca/strings.xml b/OpenKeychain/src/main/res/values-ca/strings.xml
index bf88c38b0..941a9d845 100644
--- a/OpenKeychain/src/main/res/values-ca/strings.xml
+++ b/OpenKeychain/src/main/res/values-ca/strings.xml
@@ -699,8 +699,7 @@
   <string name="nav_backup">Còpia de seguretat/Restaura</string>
   <string name="nav_transfer">Transferència Wifi segura</string>
   <string name="nav_shop">Botiga</string>
-  <string name="nav_autocrypt">Proveu Autocrypt amb Thunderbird</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Escriviu text</string>
   <!--certs-->
   <string name="cert_default">per defecte</string>
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 816d4ef61..d6ecf4f37 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -815,8 +815,7 @@
   <string name="nav_backup">Záloha/Obnova</string>
   <string name="nav_transfer">Bezpečný přenos přes WiFi</string>
   <string name="nav_shop">Obchod</string>
-  <string name="nav_autocrypt">Vyzkoušejte Autocrypt s Thunderbird</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Napsat text</string>
   <!--certs-->
   <string name="cert_default">výchozí</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index d9e9ca0cc..b45742283 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -779,8 +779,7 @@
   <string name="nav_backup">Backup/Wiederherstellung</string>
   <string name="nav_transfer">Sichere WiFi Übertragung</string>
   <string name="nav_shop">Shop</string>
-  <string name="nav_autocrypt">Autocrypt mit Thunderbird probieren</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Text eingeben</string>
   <!--certs-->
   <string name="cert_default">normal</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 31c3311f2..7f7839373 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -779,8 +779,7 @@
   <string name="nav_backup">Sauvegarder/Restaurer</string>
   <string name="nav_transfer">Transfert Wi-Fi sécurisé</string>
   <string name="nav_shop">Boutique</string>
-  <string name="nav_autocrypt">Essayer Autocrypt avec Thunderbird</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Saisir le texte</string>
   <!--certs-->
   <string name="cert_default">valeur par défaut</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index ef9dfbdfa..8d5590187 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -765,8 +765,7 @@
   <string name="nav_backup">バックアップ/リストア</string>
   <string name="nav_transfer">安全な Wifi 転送</string>
   <string name="nav_shop">ショップ</string>
-  <string name="nav_autocrypt">Thunderbird と Autocrypt をお試しください</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">テキストを入力</string>
   <!--certs-->
   <string name="cert_default">デフォルト</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index e3508df85..b37557207 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -779,8 +779,7 @@
   <string name="nav_backup">Back-up/herstellen</string>
   <string name="nav_transfer">Beveiligde wifi-overdracht</string>
   <string name="nav_shop">Winkel</string>
-  <string name="nav_autocrypt">Probeer Autocrypt met Thunderbird</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Voer tekst in</string>
   <!--certs-->
   <string name="cert_default">standaard</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 3937085f5..39f2ca095 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -816,8 +816,7 @@
   <string name="nav_backup">Резервирование/Восстановление</string>
   <string name="nav_transfer">Безопасная передача по Wi-Fi</string>
   <string name="nav_shop">Магазин</string>
-  <string name="nav_autocrypt">Попробуйте Autocrypt с Thunderbird</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Напишите текст</string>
   <!--certs-->
   <string name="cert_default">по умолчанию</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index 41d397af1..aaf318b67 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -775,8 +775,7 @@
   <string name="nav_backup">Säkerhetskopiera/återställa</string>
   <string name="nav_transfer">Säker Wi-Fi-överföring</string>
   <string name="nav_shop">Butik</string>
-  <string name="nav_autocrypt">Prova Autocrypt med Thunderbird</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">Skriv text</string>
   <!--certs-->
   <string name="cert_default">förval</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index d8a0ebd96..3a9bae2e0 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -761,8 +761,7 @@
   <string name="nav_backup">备份/恢复</string>
   <string name="nav_transfer">安全 Wifi 传输</string>
   <string name="nav_shop">商店</string>
-  <string name="nav_autocrypt">尝试在 Thunderbird 中自动加密</string>
-  <!--hints-->
+    <!--hints-->
   <string name="encrypt_content_edit_text_hint">此处输入要加密的内容</string>
   <!--certs-->
   <string name="cert_default">默认</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 597ca093c..ba619089c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -818,7 +818,6 @@
     <string name="nav_backup">"Backup/Restore"</string>
     <string name="nav_transfer">"Secure Wifi Transfer"</string>
     <string name="nav_shop">Shop</string>
-    <string name="nav_autocrypt">Try Autocrypt with Thunderbird</string>
 
     <!-- hints -->
     <string name="encrypt_content_edit_text_hint">"Type text"</string>