diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
index e764539217a9db62b799a77d1f557c60b46738f9..1e81dc4c2064e1424248ee88b3ddd5cfe5d002e1 100644
--- a/src/main/res/menu/activity_conversations.xml
+++ b/src/main/res/menu/activity_conversations.xml
@@ -22,10 +22,4 @@
         android:title="@string/scan_qr_code"
         android:visible="@bool/show_qr_code_scan"
         app:showAsAction="always" />
-    <item
-        android:id="@+id/action_cleanup"
-        android:orderInCategory="15"
-        android:title="Cleanup Conversations"
-        android:visible="true"
-        app:showAsAction="never" />
 </menu>
diff --git a/src/main/res/menu/fragment_conversations_overview.xml b/src/main/res/menu/fragment_conversations_overview.xml
index 451b302d8ff2258d7c1a3f517a7381157399fbaf..0c1bfdf3bc2b4daac1b0c9959cd5dd3535290029 100644
--- a/src/main/res/menu/fragment_conversations_overview.xml
+++ b/src/main/res/menu/fragment_conversations_overview.xml
@@ -51,6 +51,11 @@
         android:orderInCategory="90"
         android:title="@string/action_account"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_cleanup"
+        android:orderInCategory="95"
+        android:title="Cleanup Conversations"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"