diff --git a/app/css/app.css b/app/css/app.css
index 38f3e2d0..59654759 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -1072,8 +1072,9 @@ div.im_message_video_thumb {
     padding-bottom: 56.25%; // 16/9 ratio
     height: 0;
     overflow: hidden;
+    margin-top: 5px;
 }
-.im_message_iframe_video iframe, object, embed {
+.im_message_iframe_video iframe {
     position: absolute;
     top: 0;
     left: 0;
diff --git a/app/js/services.js b/app/js/services.js
index 80cd2372..b0c9e0a6 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -2427,6 +2427,7 @@ angular.module('myApp.services', [])
   }
 
   var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')', 'i');
+  var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|.be|be.com|.b)(?:\/v\/|\/watch\\?v=|e\/|\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/;
 
   return {
     wrapRichText: wrapRichText
@@ -2545,12 +2546,15 @@ angular.module('myApp.services', [])
     }
 
     // console.log(4, text, html);
-    var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|.be|be.com|.b)(?:\/v\/|\/watch\\?v=|e\/|\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/;
-    if (!options.noLinks && youtubeRegex.test(text)) {
-        var videoID = youtubeRegex.exec(text)[1];
+    if (!options.noLinks) {
+      var youtubeMatches = text.match(youtubeRegex),
+          videoID = youtubeMatches && youtubeMatches[1];
+
+      if (videoID) {
         text = text + '<div class="im_message_iframe_video"><iframe type="text/html" frameborder="0" ' +
-            'src="http://www.youtube.com/embed/' + videoID +
-            '?autoplay=0&amp;"></iframe></div>';
+              'src="http://www.youtube.com/embed/' + videoID +
+              '?autoplay=0&amp;controls=2"></iframe></div>'
+      }
     }
 
     return $sce.trustAs('html', text);