diff --git a/app/assets/javascripts/backbone/plugins/youtube_embed.js.coffee b/app/assets/javascripts/backbone/plugins/youtube_embed.js.coffee
index 7193f9e8..fa8251b6 100644
--- a/app/assets/javascripts/backbone/plugins/youtube_embed.js.coffee
+++ b/app/assets/javascripts/backbone/plugins/youtube_embed.js.coffee
@@ -6,9 +6,10 @@ class Kandan.Plugins.YouTubeEmbed
 
     template: _.template '''
       <div class="youtube-preview">
-        <a target="_blank" class="youtube-preview-link" href="<%= videoUrl %>">
-          <img class="youtube-preview-image" src="<%= thumbUrl %>" />
-        </a>
+            <iframe width="560" height="315"
+                    src="http://www.youtube.com/embed/<%= videoId %>"
+                    frameborder="0" allowfullscreen>
+            </iframe>
         <div class="name"><%= subtitle %></div>
       </div>
     '''
@@ -27,6 +28,7 @@ class Kandan.Plugins.YouTubeEmbed
         videoUrl = message.content.split(" ")[0]
 
       videoId = message.content.match(@options.idRegex)[1]
+
       thumbUrl = "http://img.youtube.com/vi/#{ videoId }/0.jpg"
 
       subtitle = null
@@ -34,8 +36,7 @@ class Kandan.Plugins.YouTubeEmbed
       subtitle ||= videoUrl
 
       message.content = @options.template({
-        videoUrl: videoUrl,
-        thumbUrl: thumbUrl,
+        videoId: videoId
         subtitle: subtitle
       })
       return Kandan.Helpers.Activities.buildFromMessageTemplate(message)