3 files changed, 23 insertions, 6 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index f5341c0bc..6a880f0ee 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -100,8 +100,12 @@ export default class ActivityLogModal extends React.Component {
 
             if (currentSession.props.platform === 'Windows') {
                 devicePicture = 'fa fa-windows';
-            } else if (currentSession.props.platform === 'Macintosh' || currentSession.props.platform === 'iPhone') {
+            } else if (currentSession.props.platform === 'Macintosh' ||
+                currentSession.props.platform === 'iPhone') {
                 devicePicture = 'fa fa-apple';
+            } else if (currentSession.props.platform.browser.indexOf('Mattermost/') === 0) {
+                devicePicture = 'fa fa-apple';
+                devicePlatform = 'iPhone';
             } else if (currentSession.props.platform === 'Linux') {
                 if (currentSession.props.os.indexOf('Android') >= 0) {
                     devicePlatform = 'Android';
diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx
index 827654e1b..4cde5feed 100644
--- a/web/react/components/delete_post_modal.jsx
+++ b/web/react/components/delete_post_modal.jsx
@@ -23,7 +23,7 @@ export default class DeletePostModal extends React.Component {
         this.selectedList = null;
 
         this.state = {
-            show: true,
+            show: false,
             post: null,
             commentCount: 0,
             error: ''
@@ -40,6 +40,14 @@ export default class DeletePostModal extends React.Component {
         ModalStore.removeModalListener(ActionTypes.TOGGLE_DELETE_POST_MODAL, this.handleToggle);
     }
 
+    componentDidUpdate(prevProps, prevState) {
+        if (this.state.show && !prevState.show) {
+            setTimeout(() => {
+                $(ReactDOM.findDOMNode(this.refs.deletePostBtn)).focus();
+            }, 0);
+        }
+    }
+
     handleDelete() {
         Client.deletePost(
             this.state.post.channel_id,
@@ -149,10 +157,10 @@ export default class DeletePostModal extends React.Component {
                         {'Cancel'}
                     </button>
                     <button
+                        ref='deletePostBtn'
                         type='button'
                         className='btn btn-danger'
                         onClick={this.handleDelete}
-                        autoFocus='autofocus'
                     >
                         {'Delete'}
                     </button>
diff --git a/web/react/components/file_info_preview.jsx b/web/react/components/file_info_preview.jsx
index 4b76cd162..45d89007f 100644
--- a/web/react/components/file_info_preview.jsx
+++ b/web/react/components/file_info_preview.jsx
@@ -5,11 +5,16 @@ import * as Utils from '../utils/utils.jsx';
 
 export default function FileInfoPreview({filename, fileUrl, fileInfo}) {
     // non-image files include a section providing details about the file
-    let infoString = 'File type ' + fileInfo.extension.toUpperCase();
-    if (fileInfo.size > 0) {
-        infoString += ', Size ' + Utils.fileSizeToString(fileInfo.size);
+    const infoParts = [];
+
+    if (fileInfo.extension !== '') {
+        infoParts.push('File type ' + fileInfo.extension.toUpperCase());
     }
 
+    infoParts.push('Size ' + Utils.fileSizeToString(fileInfo.size));
+
+    const infoString = infoParts.join(', ');
+
     const name = decodeURIComponent(Utils.getFileName(filename));
 
     return (