diff --git a/CHANGES.md b/CHANGES.md
index a99c89004..8cc69437b 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,8 @@
 - Room name wasn't being updated after changing it in the configuration form. [jcbrand]
 - Server disco features were "forgotten" after logging out and then logging in again. [jcbrand]
 - Don't show duplicate sent groupchat messages in Slack chat rooms. [jcbrand]
+- Bookmark icon shown in the open rooms list when `allow_bookmarks` is to `false`. [jcbrand]
+- #879 Text in links are converted to smileys leading to non-clickable links.
 
 ## 3.1.1 (2017-07-12)
 
diff --git a/src/converse-roomslist.js b/src/converse-roomslist.js
index ca97b37c8..01f9219f6 100644
--- a/src/converse-roomslist.js
+++ b/src/converse-roomslist.js
@@ -117,6 +117,7 @@
                     }
                     const div = document.createElement('div');
                     div.innerHTML = tpl_rooms_list_item(_.extend(item.toJSON(), {
+                        'allow_bookmarks': _converse.allow_bookmarks,
                         'info_leave_room': __('Leave this room'),
                         'info_remove_bookmark': __('Unbookmark this room'),
                         'info_title': __('Show more information on this room'),
diff --git a/src/templates/rooms_list_item.html b/src/templates/rooms_list_item.html
index e1af31dc6..76de90f06 100644
--- a/src/templates/rooms_list_item.html
+++ b/src/templates/rooms_list_item.html
@@ -9,9 +9,12 @@
    data-room-jid="{{{jid}}}"
    data-room-name="{{{name}}}"
    title="{{{info_leave_room}}}" href="#">&nbsp;</a>
+
+{[ if (allow_bookmarks) { ]}
 <a class="right remove-bookmark icon-pushpin {[ if (bookmarked) { ]} button-on {[ } ]}"
    data-room-jid="{{{jid}}}" data-bookmark-name="{{{name}}}"
    title="{{{info_remove_bookmark}}}" href="#">&nbsp;</a>
+{[ } ]}
 <a class="right room-info icon-room-info" data-room-jid="{{{jid}}}"
    title="{{{info_title}}}" href="#">&nbsp;</a>
 </dd>