diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index fb4aa94e5edbf9072d9792894de79095dbd48da7..6cf016714d6fd88f2b64879211037f21a884a17d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -628,18 +628,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
             case R.id.action_scan_qr_code:
                 UriHandlerActivity.scan(this);
                 return true;
-            case R.id.action_cleanup:
-                for (Conversation c : ImmutableList.copyOf(xmppConnectionService.getConversations())) {
-                    c.trim();
-                    if (c.getDraftMessage() != null) continue;
-                    if (c.getReplyTo() != null) continue;
-                    if (c.getMode() == Conversation.MODE_MULTI) continue;
-                    if (c.getBooleanAttribute(Conversation.ATTRIBUTE_PINNED_ON_TOP, false)) continue;
-                    if (c.unreadCount() > 0) continue;
-                    if (c.getSortableTime() > System.currentTimeMillis() - 600000) continue;
-                    xmppConnectionService.archiveConversation(c);
-                }
-                break;
             case R.id.action_search_all_conversations:
                 startActivity(new Intent(this, SearchActivity.class));
                 return true;
diff --git a/src/main/res/menu/fragment_conversations_overview.xml b/src/main/res/menu/fragment_conversations_overview.xml
index 0c1bfdf3bc2b4daac1b0c9959cd5dd3535290029..451b302d8ff2258d7c1a3f517a7381157399fbaf 100644
--- a/src/main/res/menu/fragment_conversations_overview.xml
+++ b/src/main/res/menu/fragment_conversations_overview.xml
@@ -51,11 +51,6 @@
         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"