diff --git a/js/plugins.js b/js/plugins.js
index 1d971cd..0b3211e 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -400,22 +400,17 @@ plugins.factory('userPlugins', function() {
     /*
      * Vine plugin
      */
-    var vinePlugin = new Plugin(function(message) {
-
-        var regexp = /https?:\/\/(www\.)?vine.co\/v\/([a-zA-Z0-9]+)(\/.*)?/g;
-        var content = [];
-        var match;
-
-        // Iterate over all matches
-        while ((match = regexp.exec(message)) !== null) {
-            var id = match[2];
-            var embedurl = "https://vine.co/v/" + id + "/embed/simple?audio=1";
-            content.push('<iframe class="vine-embed" src="' + embedurl + '" width="600" height="600" frameborder="0"></iframe><script async src="//platform.vine.co/static/scripts/embed.js" charset="utf-8"></script>');
-        }
-
-        return content;
-    });
-    vinePlugin.name = "Vine";
+    var vinePlugin = new Plugin(
+        urlPlugin(function (url) {
+            var regexp = /^https?:\/\/(www\.)?vine.co\/v\/([a-zA-Z0-9]+)(\/.*)?/i,
+                match = url.match(regexp);
+            if (match) {
+                var id = match[2], embedurl = "https://vine.co/v/" + id + "/embed/simple?audio=1";
+                return '<iframe class="vine-embed" src="' + embedurl + '" width="600" height="600" frameborder="0"></iframe><script async src="//platform.vine.co/static/scripts/embed.js" charset="utf-8"></script>';
+            }
+        })
+    );
+    vinePlugin.name = 'Vine';
 
     return {
         plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, tweetPlugin, vinePlugin]