1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 8f4e468c7..82379facd 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -1003,10 +1003,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         }
 
         if (isBookmarkChecked) {
-            if (account.hasBookmarkFor(conferenceJid)) {
-                layout.setError(getString(R.string.bookmark_already_exists));
+            Bookmark bookmark = account.getBookmark(conferenceJid);
+            if (bookmark != null) {
+                dialog.dismiss();
+                openConversationsForBookmark(bookmark);
             } else {
-                final Bookmark bookmark = new Bookmark(account, conferenceJid.asBareJid());
+                bookmark = new Bookmark(account, conferenceJid.asBareJid());
                 bookmark.setAutojoin(getBooleanPreference("autojoin", R.bool.autojoin));
                 final String nick = conferenceJid.getResource();
                 if (nick != null && !nick.isEmpty() && !nick.equals(MucOptions.defaultNick(account))) {
@@ -1100,6 +1102,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
             final AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
             if (mResContextMenu == R.menu.conference_context) {
                 activity.conference_context_id = acmi.position;
+                //TODO hide share if known to be private
             } else if (mResContextMenu == R.menu.contact_context) {
                 activity.contact_context_id = acmi.position;
                 final Contact contact = (Contact) activity.contacts.get(acmi.position);