diff --git a/js/wysiwyg-media.js b/js/wysiwyg-media.js
index 97697f0..bbcaac0 100644
--- a/js/wysiwyg-media.js
+++ b/js/wysiwyg-media.js
@@ -169,7 +169,7 @@ Drupal.wysiwyg.plugins.media = {
     // string. Using a regular expression instead of jQuery manipulation to
     // prevent <script> tags from being displaced.
     // @see http://drupal.org/node/1280758.
-    if (matches = content.match(/<img[^>]+class=([\'"])media-image[^>]*>/gi)) {
+    if (matches = content.match(/<img[^>]+class=([\'"]media-image |[^>]*\smedia-image\s|[^>]*\smedia-image[\'"]|[\'"]media-image[\'"])[^>]*>/gi)) {
       for (var i = 0; i < matches.length; i++) {
         var imageTag = matches[i];
         var inlineTag = Drupal.wysiwyg.plugins.media.createTag($(imageTag));