diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java
index aa0deee..ba98625 100644
--- a/application/src/org/yaaic/activity/ConversationActivity.java
+++ b/application/src/org/yaaic/activity/ConversationActivity.java
@@ -429,19 +429,6 @@ public class ConversationActivity extends SherlockActivity implements ServiceCon
         return true;
     }
 
-    /**
-     * On prepare options menu
-     */
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu)
-    {
-        menu.getItem(0).setEnabled(server.isConnected()); // join
-        menu.getItem(1).setEnabled(server.isConnected()); // users
-        menu.getItem(2).setEnabled(server.isConnected()); // close
-
-        return true;
-    }
-
     /**
      * On menu item selected
      */