diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 51a3394a6f..c4615f301c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -7827,7 +7827,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibDelete,
                             context.getString(R.string.title_trash_selection)));
 
-                if (ibMove != null && ibMove.getVisibility() == View.VISIBLE && ibMove.isEnabled())
+                if (ibMove.getVisibility() == View.VISIBLE && ibMove.isEnabled())
                     info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibMove,
                             context.getString(R.string.title_move_to)));
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 76c67fa221..2023d2a20f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5932,6 +5932,7 @@ public class FragmentMessages extends FragmentBase
 
             final Context context = getContext();
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            boolean primary_inbox = "inbox".equals(prefs.getString("startup", "unified"));
             String sort = prefs.getString(getSort(context, viewType, type), "time");
             boolean ascending = prefs.getBoolean(getSortOrder(context, viewType, type), outbox);
             boolean filter_seen = prefs.getBoolean(getFilter(context, "seen", viewType, type), false);
@@ -6069,7 +6070,7 @@ public class FragmentMessages extends FragmentBase
                     .setVisible(viewType == AdapterMessage.ViewType.THREAD);
 
             menu.findItem(R.id.menu_compact).setChecked(compact);
-            menu.findItem(R.id.menu_theme).setVisible(viewType == AdapterMessage.ViewType.UNIFIED);
+            menu.findItem(R.id.menu_theme).setVisible(viewType == AdapterMessage.ViewType.UNIFIED || primary_inbox);
 
             menu.findItem(R.id.menu_confirm_links)
                     .setChecked(confirm_links)
@@ -6096,7 +6097,7 @@ public class FragmentMessages extends FragmentBase
             }
 
             menu.findItem(R.id.menu_sync_more).setVisible(folder);
-            menu.findItem(R.id.menu_force_sync).setVisible(viewType == AdapterMessage.ViewType.UNIFIED);
+            menu.findItem(R.id.menu_force_sync).setVisible(viewType == AdapterMessage.ViewType.UNIFIED || primary_inbox);
             menu.findItem(R.id.menu_force_send).setVisible(outbox);
 
             menu.findItem(R.id.menu_expunge).setVisible(viewType == AdapterMessage.ViewType.FOLDER &&