diff --git a/css/converse.css b/css/converse.css
index 233ea2315..936246856 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -6250,8 +6250,7 @@ body.reset {
       width: 100%; }
     #conversejs:not(.fullscreen) #minimized-chats .minimized-chats-flyout.minimized {
       height: auto; }
-  #conversejs:not(.fullscreen) #minimized-chats .unread-message-count,
-  #conversejs:not(.fullscreen) #minimized-chats .chat-head-message-count {
+  #conversejs:not(.fullscreen) #minimized-chats .unread-message-count {
     font-weight: bold;
     background-color: white;
     border: 1px solid;
diff --git a/sass/converse/_minimized_chats.scss b/sass/converse/_minimized_chats.scss
index 91a013f85..5ada496b9 100644
--- a/sass/converse/_minimized_chats.scss
+++ b/sass/converse/_minimized_chats.scss
@@ -64,8 +64,7 @@
             }
         }
 
-        .unread-message-count,
-        .chat-head-message-count {
+        .unread-message-count {
             font-weight: bold;
             background-color: white;
             border: 1px solid;
diff --git a/sass/inverse/_minimized_chats.scss b/sass/inverse/_minimized_chats.scss
index 6346bca01..b448357c9 100644
--- a/sass/inverse/_minimized_chats.scss
+++ b/sass/inverse/_minimized_chats.scss
@@ -40,8 +40,7 @@
             }
         }
 
-        .unread-message-count,
-        .chat-head-message-count {
+        .unread-message-count {
             font-weight: bold;
             background-color: white;
             border: 1px solid;
diff --git a/spec/chatbox.js b/spec/chatbox.js
index 5128619b1..26a32837f 100644
--- a/spec/chatbox.js
+++ b/spec/chatbox.js
@@ -487,24 +487,29 @@
                         null, ['rosterGroupsFetched'], {},
                         function (done, _converse) {
 
+                    var timeout = true, $toolbar, view;
                     test_utils.createContacts(_converse, 'current');
                     test_utils.openControlBox();
 
                     test_utils.waitUntil(function () {
-                            return $(_converse.rosterview.el).find('.roster-group').length;
-                        }, 300)
-                    .then(function () {
+                        return $(_converse.rosterview.el).find('.roster-group').length;
+                    }, 300).then(function () {
                         // TODO: More tests can be added here...
                         var contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost';
                         test_utils.openChatBoxFor(_converse, contact_jid);
-                        var view = _converse.chatboxviews.get(contact_jid);
-                        var $toolbar = $(view.el).find('ul.chat-toolbar');
-                        expect($toolbar.children('.toggle-otr').length).toBe(1);
+                        view = _converse.chatboxviews.get(contact_jid);
+                        $toolbar = $(view.el).find('ul.chat-toolbar');
+                        expect($toolbar.find('.toggle-otr').length).toBe(1);
                         // Register spies
                         spyOn(view, 'toggleOTRMenu').and.callThrough();
                         view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
 
+                        timeout = false;
                         $toolbar[0].querySelector('.toggle-otr').click();
+                        return test_utils.waitUntil(function () {
+                            return view.el.querySelector('.otr-menu').offsetHeight;
+                        }, 300)
+                    }).then(function () {
                         expect(view.toggleOTRMenu).toHaveBeenCalled();
                         done();
                     });
@@ -1360,7 +1365,7 @@
                         expect(_converse.emit).toHaveBeenCalledWith('message', jasmine.any(Object));
                         var trimmed_chatboxes = _converse.minimized_chats;
                         var trimmedview = trimmed_chatboxes.get(contact_jid);
-                        var $count = $(trimmedview.el).find('.chat-head-message-count');
+                        var $count = $(trimmedview.el).find('.message-count');
                         expect(u.isVisible(chatview.el)).toBeFalsy();
                         expect(trimmedview.model.get('minimized')).toBeTruthy();
                         expect(u.isVisible($count[0])).toBeTruthy();
@@ -1376,7 +1381,7 @@
                         );
                         expect(u.isVisible(chatview.el)).toBeFalsy();
                         expect(trimmedview.model.get('minimized')).toBeTruthy();
-                        $count = $(trimmedview.el).find('.chat-head-message-count');
+                        $count = $(trimmedview.el).find('.message-count');
                         expect(u.isVisible($count[0])).toBeTruthy();
                         expect($count.html()).toBe('2');
                         trimmedview.el.querySelector('.restore-chat').click();
@@ -2676,7 +2681,7 @@
                 };
                 var selectUnreadMsgCount = function () {
                     var minimizedChatBoxView = _converse.minimized_chats.get(sender_jid);
-                    return $(minimizedChatBoxView.el).find('.chat-head-message-count');
+                    return $(minimizedChatBoxView.el).find('.message-count');
                 };
 
                 var chatbox = _converse.chatboxes.get(sender_jid);
@@ -2706,7 +2711,7 @@
                 };
                 var selectUnreadMsgCount = function () {
                     var minimizedChatBoxView = _converse.minimized_chats.get(sender_jid);
-                    return $(minimizedChatBoxView.el).find('.chat-head-message-count');
+                    return $(minimizedChatBoxView.el).find('.message-count');
                 };
 
                 var chatboxview = _converse.chatboxviews.get(sender_jid);
diff --git a/src/templates/trimmed_chat.html b/src/templates/trimmed_chat.html
index 8a5e8f135..283813ef4 100644
--- a/src/templates/trimmed_chat.html
+++ b/src/templates/trimmed_chat.html
@@ -1,6 +1,6 @@
 <a href="#" class="restore-chat w-100 align-self-center" title="{{{o.tooltip}}}">
     {[ if (o.num_unread) { ]} 
-        <span class="badge badge-light">{{{o.num_unread}}}</span>
+        <span class="message-count badge badge-light">{{{o.num_unread}}}</span>
     {[ } ]}
     {{{o.title || o.jid }}}
 </a>