2 files changed, 19 insertions, 1 deletions

diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx
index 031abc36a..8315430e4 100644
--- a/web/react/components/team_import_tab.jsx
+++ b/web/react/components/team_import_tab.jsx
@@ -35,7 +35,7 @@ export default class TeamImportTab extends React.Component {
         var uploadHelpText = (
             <div>
                 <p>{'Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team\'\s public channels.'}</p>
-                <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts and channels with underscores do not yet import.'}</p>
+                <p>{'The Slack import to Mattermost is in "Preview". Slack bot posts do not yet import.'}</p>
             </div>
         );
 
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index b0eaba5d6..8d3495e3b 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -105,6 +105,14 @@ export default class ViewImageModal extends React.Component {
             this.loadImage(this.state.imgId);
         }.bind(this));
 
+        $('#' + this.props.modalId).on('hidden.bs.modal', function onModalHide() {
+            if (this.refs.video) {
+                var video = React.findDOMNode(this.refs.video);
+                video.pause();
+                video.currentTime = 0;
+            }
+        }.bind(this));
+
         $(React.findDOMNode(this.refs.modal)).click(function onModalClick(e) {
             if (e.target === this || e.target === React.findDOMNode(this.refs.imageBody)) {
                 $('.image_modal').modal('hide');
@@ -211,6 +219,16 @@ export default class ViewImageModal extends React.Component {
                         />
                     </a>
                 );
+            } else if (fileType === 'video' || fileType === 'audio') {
+                content = (
+                    <video
+                        ref='video'
+                        data-setup='{}'
+                        controls='controls'
+                    >
+                        <source src={Utils.getWindowLocationOrigin() + '/api/v1/files/get' + filename} />
+                    </video>
+                );
             } else {
                 // non-image files include a section providing details about the file
                 var infoString = 'File type ' + fileInfo.ext.toUpperCase();