diff --git a/src/converse-muc.js b/src/converse-muc.js
index 844fc19ae..07134996b 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -1827,7 +1827,7 @@
                 displayJoinNotification (stanza) {
                     const nick = Strophe.getResourceFromJid(stanza.getAttribute('from'));
                     const stat = stanza.querySelector('status');
-                    const last_el = this.content.querySelector(':last-child');
+                    const last_el = this.content.querySelector('.message:last-child');
                     if (_.includes(_.get(last_el, 'classList', []), 'chat-info') &&
                             _.get(last_el, 'dataset', {}).leave === `"${nick}"`) {
                         last_el.outerHTML = 
diff --git a/src/templates/info.html b/src/templates/info.html
index 42f9cfd07..f074e198c 100644
--- a/src/templates/info.html
+++ b/src/templates/info.html
@@ -1 +1 @@
-<div class="chat-info" {{{o.data}}}>{{{o.message}}}</div>
+<div class="message chat-info" {{{o.data}}}>{{{o.message}}}</div>
diff --git a/src/templates/message.html b/src/templates/message.html
index b203381b1..15cfe1474 100644
--- a/src/templates/message.html
+++ b/src/templates/message.html
@@ -1,4 +1,4 @@
-<div class="chat-message {{{o.extra_classes}}}" data-isodate="{{{o.isodate}}}" data-msgid="{{{o.msgid}}}">
+<div class="message chat-message {{{o.extra_classes}}}" data-isodate="{{{o.isodate}}}" data-msgid="{{{o.msgid}}}">
     <span class="chat-msg-author chat-msg-{{{o.sender}}}">{{{o.time}}} {{{o.username}}}:&nbsp;</span>
     <span class="chat-msg-content"><!-- message gets added here via renderMessage --></span>
 </div>
diff --git a/src/utils.js b/src/utils.js
index 16f4677e9..2a97c180d 100755
--- a/src/utils.js
+++ b/src/utils.js
@@ -169,7 +169,7 @@
         return _.includes(el.classList, className);
     };
 
-    u.slideOut = function (el, duration=250) {
+    u.slideOut = function (el, duration=200) {
         /* Shows/expands an element by sliding it out of itself
          *
          * Parameters:
@@ -233,7 +233,7 @@
         });
     };
 
-    u.slideIn = function (el, duration=250) {
+    u.slideIn = function (el, duration=200) {
         /* Hides/collapses an element by sliding it into itself. */
         return new Promise((resolve, reject) => {
             if (_.isNil(el)) {