diff --git a/src/CallHandler.js b/src/CallHandler.js
index 268a599d8e..4d25212c0c 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -100,8 +100,16 @@ function pause(audioId) {
 
 function _setCallListeners(call) {
     call.on("error", function(err) {
-        console.error("Call error: %s", err);
-        console.error(err.stack);
+        if (err.name === "UnknownDeviceError") {
+            dis.dispatch({
+                action: 'unknown_device_error',
+                err: err,
+                room: MatrixClientPeg.get().getRoom(call.roomId),
+            });
+        } else {
+            console.error("Call error: %s", err);
+            console.error(err.stack);
+        }
         call.hangup();
         _setCallState(undefined, call.roomId, "ended");
     });
diff --git a/src/Resend.js b/src/Resend.js
index e2f0c5a1ee..c9a0bf8aa8 100644
--- a/src/Resend.js
+++ b/src/Resend.js
@@ -21,8 +21,9 @@ var Modal = require('./Modal');
 
 module.exports = {
     resend: function(event) {
+        const room = MatrixClientPeg.get().getRoom(event.getRoomId());
         MatrixClientPeg.get().resendEvent(
-            event, MatrixClientPeg.get().getRoom(event.getRoomId())
+            event, room
         ).done(function(res) {
             dis.dispatch({
                 action: 'message_sent',
@@ -33,16 +34,11 @@ module.exports = {
             // https://github.com/vector-im/riot-web/issues/3148
             console.log('Resend got send failure: ' + err.name + '('+err+')');
             if (err.name === "UnknownDeviceError") {
-                var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
-                Modal.createDialog(UnknownDeviceDialog, {
-                    devices: err.devices,
-                    room: MatrixClientPeg.get().getRoom(event.getRoomId()),
-                    onFinished: (r) => {
-                        // XXX: temporary logging to try to diagnose
-                        // https://github.com/vector-im/riot-web/issues/3148
-                        console.log('UnknownDeviceDialog closed with '+r);
-                    },
-                }, "mx_Dialog_unknownDevice");
+                dis.dispatch({
+                    action: 'unknown_device_error',
+                    err: err,
+                    room: room,
+                });
             }
 
             dis.dispatch({
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e885614ffe..6b191305f2 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -518,6 +518,18 @@ module.exports = React.createClass({
             case 'set_theme':
                 this._onSetTheme(payload.value);
                 break;
+            case 'unknown_device_error':
+                var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
+                Modal.createDialog(UnknownDeviceDialog, {
+                    devices: payload.err.devices,
+                    room: payload.room,
+                    onFinished: (r) => {
+                        // XXX: temporary logging to try to diagnose
+                        // https://github.com/vector-im/riot-web/issues/3148
+                        console.log('UnknownDeviceDialog closed with '+r);
+                    },
+                }, "mx_Dialog_unknownDevice");
+                break;
             case 'on_logged_in':
                 this._onLoggedIn();
                 break;
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 3bebb8fdda..9b043814bc 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -85,7 +85,7 @@ UnknownDeviceList.propTypes = {
 
 
 export default React.createClass({
-    displayName: 'UnknownEventDialog',
+    displayName: 'UnknownDeviceDialog',
 
     propTypes: {
         room: React.PropTypes.object.isRequired,
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 020c2238cb..e47bc3f566 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -34,16 +34,11 @@ export function onSendMessageFailed(err, room) {
     // https://github.com/vector-im/riot-web/issues/3148
     console.log('MessageComposer got send failure: ' + err.name + '('+err+')');
     if (err.name === "UnknownDeviceError") {
-        const UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
-        Modal.createDialog(UnknownDeviceDialog, {
-            devices: err.devices,
+        dis.dispatch({
+            action: 'unknown_device_error',
+            err: err,
             room: room,
-            onFinished: (r) => {
-                // XXX: temporary logging to try to diagnose
-                // https://github.com/vector-im/riot-web/issues/3148
-                console.log('UnknownDeviceDialog closed with '+r);
-            },
-        }, "mx_Dialog_unknownDevice");
+        });
     }
     dis.dispatch({
         action: 'message_send_failed',