diff --git a/src/Modal.js b/src/Modal.js
index 89e8b1361c..b6cc46ed45 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -177,7 +177,7 @@ class ModalManager {
 
         var modal = this._modals[0];
         var dialog = (
-            <div className={"mx_Dialog_wrapper " + modal.className}>
+            <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '') }>
                 <div className="mx_Dialog">
                     {modal.elem}
                 </div>
diff --git a/src/Resend.js b/src/Resend.js
index e67c812b7c..59a8bd4192 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -33,7 +33,7 @@ module.exports = {
                 var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
                 Modal.createDialog(UnknownDeviceDialog, {
                     devices: err.devices
-                });
+                }, "mx_Dialog_unknownDevice");
             }
 
             dis.dispatch({
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index aa64e9ed99..11d0479f15 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import GeminiScrollbar from 'react-gemini-scrollbar';
 
 function UserUnknownDeviceList(props) {
     const {userDevices} = props;
@@ -81,12 +82,12 @@ export default React.createClass({
                 onFinished={this.props.onFinished}
                 title='Room contains unknown devices'
             >
-                <div className="mx_Dialog_content">
+                <GeminiScrollbar autoshow={true} className="mx_Dialog_content">
                     <h4>This room contains devices which have not been
                     verified.</h4>
                     <p>
                         This means there is no guarantee that the devices belong
-                        to a valid user of the room.
+                        to a rightful user of the room.
                     </p><p>
                         We recommend you go through the verification process
                         for each device before continuing, but you can resend
@@ -94,7 +95,7 @@ export default React.createClass({
                     </p>
                     <p>Unknown devices:</p>
                     <UnknownDeviceList devices={this.props.devices} />
-                </div>
+                </GeminiScrollbar>
                 <div className="mx_Dialog_buttons">
                     <button className="mx_Dialog_primary" autoFocus={ true }
                             onClick={ this.props.onFinished } >
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index d81f89a3c3..e8a4727fc6 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -34,7 +34,7 @@ export function onSendMessageFailed(err) {
         const UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
         Modal.createDialog(UnknownDeviceDialog, {
             devices: err.devices,
-        });
+        }, "mx_Dialog_unknownDevice");
     }
     dis.dispatch({
         action: 'message_send_failed',