diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 426a707f65..f4aafbeb31 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -321,6 +321,8 @@ export default class ContentMessages {
     getUploadLimit() {
         if (this._mediaConfig !== null && this._mediaConfig["m.upload.size"] !== undefined) {
             return this._mediaConfig["m.upload.size"];
+        } else {
+            return null;
         }
     }
 
@@ -338,8 +340,8 @@ export default class ContentMessages {
                     title: _t('Replying With Files'),
                     description: (
                         <div>{_t(
-                            'At this time it is not possible to reply with a file ' +
-                            'so this will be sent without being a reply.',
+                            'At this time it is not possible to reply with a file. ' +
+                            'Would you like to upload this file without replying?',
                         )}</div>
                     ),
                     hasCancelButton: true,
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 7914810458..47de3f2cb0 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -20,27 +20,27 @@ limitations under the License.
 //  - Search results component
 //  - Drag and drop
 
-import shouldHideEvent from "../../shouldHideEvent";
+import shouldHideEvent from '../../shouldHideEvent';
 
-const React = require("react");
-const ReactDOM = require("react-dom");
+import React from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import Promise from 'bluebird';
 import filesize from 'filesize';
-const classNames = require("classnames");
+import classNames from 'classnames';
 import { _t } from '../../languageHandler';
-import {RoomPermalinkCreator} from "../../matrix-to";
+import {RoomPermalinkCreator} from '../../matrix-to';
 
-const MatrixClientPeg = require("../../MatrixClientPeg");
+import MatrixClientPeg from '../../MatrixClientPeg';
 import ContentMessages from '../../ContentMessages';
-const Modal = require("../../Modal");
-const sdk = require('../../index');
-const CallHandler = require('../../CallHandler');
-const dis = require("../../dispatcher");
-const Tinter = require("../../Tinter");
-const rate_limited_func = require('../../ratelimitedfunc');
-const ObjectUtils = require('../../ObjectUtils');
-const Rooms = require('../../Rooms');
+import Modal from '../../Modal';
+import sdk from '../../index';
+import CallHandler from '../../CallHandler';
+import dis from '../../dispatcher';
+import Tinter from '../../Tinter';
+import rate_limited_func from '../../ratelimitedfunc';
+import ObjectUtils from '../../ObjectUtils';
+import Rooms from '../../Rooms';
 
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a2f939dc81..54d4bde14a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -41,7 +41,7 @@
     "Permission Required": "Permission Required",
     "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "Replying With Files": "Replying With Files",
-    "At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.",
+    "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "At this time it is not possible to reply with a file. Would you like to upload this file without replying?",
     "Continue": "Continue",
     "The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.",
     "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",