diff --git a/plugins/media/library.js b/plugins/media/library.js
index 1295ad5..a37f002 100644
--- a/plugins/media/library.js
+++ b/plugins/media/library.js
@@ -73,6 +73,21 @@
     addImageAttributes: function (imgElement, fid, view_mode, additional) {
       imgElement.addClass('media-image');
 
+      if (additional) {
+
+        //Special handling for alt and title attributes
+        if (additional.alt) {
+          imgElement.attr('alt', additional.alt);
+          delete additional.alt; //Remove it to not add it to the class
+
+        }
+        if (additional.title) {
+          imgElement.attr('title', additional.title);
+          delete additional.title; //Remove it to not add it to the class
+        }
+
+      }
+
       this.forceAttributesIntoClass(imgElement, fid, view_mode, additional);
     },