diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index 5c3dd16a4e..4af09a6823 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -133,13 +133,17 @@ public class FragmentBase extends Fragment {
         scroll.post(new Runnable() {
             @Override
             public void run() {
-                Rect rect = new Rect();
-                child.getDrawingRect(rect);
-                scroll.offsetDescendantRectToMyCoords(child, rect);
-                int y = rect.top - scroll.getPaddingTop() + dy;
-                if (y < 0)
-                    y = 0;
-                scroll.scrollTo(0, y);
+                try {
+                    Rect rect = new Rect();
+                    child.getDrawingRect(rect);
+                    scroll.offsetDescendantRectToMyCoords(child, rect);
+                    int y = rect.top - scroll.getPaddingTop() + dy;
+                    if (y < 0)
+                        y = 0;
+                    scroll.scrollTo(0, y);
+                } catch (Throwable ex) {
+                    Log.e(ex);
+                }
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 183c6a05ba..32cefe517b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -212,6 +212,10 @@ public class FragmentSetup extends FragmentBase {
                 menu.add(Menu.NONE, R.string.title_setup_other, order++, R.string.title_setup_other)
                         .setIcon(R.drawable.twotone_auto_fix_high_24);
 
+                menu.add(Menu.NONE, R.string.title_setup_classic, order++, R.string.title_setup_classic)
+                        .setIcon(R.drawable.twotone_settings_24)
+                        .setVisible(BuildConfig.DEBUG);
+
                 SpannableString ss = new SpannableString(getString(R.string.title_setup_pop3));
                 ss.setSpan(new RelativeSizeSpan(0.9f), 0, ss.length(), 0);
                 menu.add(Menu.NONE, R.string.title_setup_pop3, order++, ss);
@@ -247,6 +251,22 @@ public class FragmentSetup extends FragmentBase {
                         } else if (itemId == R.string.title_setup_other) {
                             lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
                             return true;
+                        } else if (itemId == R.string.title_setup_classic) {
+                            ibManual.setPressed(true);
+                            ibManual.setPressed(false);
+                            manual = true;
+                            updateManual();
+                            view.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    try {
+                                        scrollTo(R.id.ibManual, 0);
+                                    } catch (Throwable ex) {
+                                        Log.e(ex);
+                                    }
+                                }
+                            });
+                            return true;
                         } else if (itemId == R.string.title_setup_pop3) {
                             lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_POP3));
                             return true;