diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
index 56ccb8b16..92bdbf910 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -453,6 +453,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     } else if (itemId == R.id.menu_export_attachment) {
       handleSaveAttachment();
       return true;
+    } else if (itemId == R.id.menu_switch_account) {
+      AccountManager.getInstance().showSwitchAccountMenu(this);
+      return true;
     }
 
     return false;
diff --git a/src/main/res/menu/forwarding_menu.xml b/src/main/res/menu/forwarding_menu.xml
index e19df9ffd..d635d04bc 100644
--- a/src/main/res/menu/forwarding_menu.xml
+++ b/src/main/res/menu/forwarding_menu.xml
@@ -5,4 +5,7 @@
     <item android:title="@string/menu_export_attachment"
           android:id="@+id/menu_export_attachment" />
 
+    <item android:title="@string/switch_account"
+          android:id="@+id/menu_switch_account" />
+
 </menu>