diff --git a/css/filedrop.css b/css/filedrop.css
index 248e019a31397e4d7e4b8e09e9a27e64e4fe990c..29c8e28d0b70b0d7dbf10934f2c0510e455a5281 100644
--- a/css/filedrop.css
+++ b/css/filedrop.css
@@ -46,6 +46,15 @@
 .filedrop .cancel {
   cursor: pointer;
 }
+.filedrop .preview {
+  width: auto;
+  height: auto;
+  max-width: 60px;
+  max-height: 40px;
+  display: inline-block;
+  float: left;
+  padding-right: 10px;
+}
 
 /* Bootstrap 3.2 progress-bar */
 @-webkit-keyframes progress-bar-stripes {
diff --git a/js/filedrop.field.js b/js/filedrop.field.js
index 155e764c9d5fb1eb0a5d9a1daad94ddc1e3f8d21..3d88ccef1783d69bd494b1bdaed68ba8e9c9e3fd 100644
--- a/js/filedrop.field.js
+++ b/js/filedrop.field.js
@@ -12,6 +12,7 @@
       speedUpdated: $.proxy(this.speedUpdated, this),
       dragOver: $.proxy(this.dragOver, this),
       drop: $.proxy(this.drop, this),
+      beforeSend: $.proxy(this.beforeSend, this),
       error: $.proxy(this.handleError, this)
     };
 
@@ -27,6 +28,16 @@
     dragOver: function(box, e) {
         this.$element.css('background-color', 'rgba(0, 0, 0, 0.3)');
     },
+    beforeSend: function (file, i, reader) {
+      var node = this.addNode(file).data('file', file);
+      node.find('.progress').show();
+      node.find('.progress-bar').addClass('progress-bar-striped active')
+
+      if (file.type.indexOf('image/') === 0 && file.size < 1e6) {
+        node.find('.preview').attr('src', 'data:' + file.type + ';base64,' +
+          btoa(reader.result));
+      }
+    },
     speedUpdated: function(i, file, speed) {
       var that = this;
       this.uploads.some(function(e) {
@@ -43,17 +54,24 @@
           e.find('.progress-bar')
             .width(value + '%')
             .attr({'aria-valuenow': value})
+            .removeClass('progress-bar-striped active');
           if (value > 99)
-            e.find('.progress-bar').addClass('progress-bar-striped active')
+            e.find('.progress-bar').addClass('progress-bar-striped active');
           return true;
         }
       });
     },
     uploadStarted: function(i, file, n, xhr) {
-      var node = this.addNode(file).data('file', file).data('xhr', xhr);
-      node.find('.trash').hide();
-      node.find('.cancel').show();
-      this.progressUpdated(i, file, 0);
+      var that = this;
+      this.uploads.some(function(e) {
+        if (e.data('file') == file) {
+          e.data('xhr', xhr);
+          e.find('.trash').hide();
+          e.find('.cancel').show();
+          that.progressUpdated(i, file, 0);
+          return true;
+        }
+      });
     },
     uploadFinished: function(i, file, json, time, xhr) {
       var that = this;
@@ -65,7 +83,7 @@
           e.data('fileId', json.id);
           e.find('.progress-bar')
             .width('100%')
-            .attr({'aria-valuenow': 100})
+            .attr({'aria-valuenow': 100});
           e.find('.trash').show();
           e.find('.upload-rate').hide();
           e.find('.cancel').hide();
@@ -98,6 +116,7 @@
       var filenode = $('<div class="file"></div>');
       filenode
           .append($('<div class="filetype"></div>').addClass())
+          .append($('<img class="preview" />'))
           .append($('<div class="filename"></div>')
             .append($('<span class="filesize"></span>').text(
               this.fileSize(parseInt(file.size))
@@ -115,7 +134,8 @@
             .attr({'aria-valuemin':0,'aria-valuemax':100})
             .hide())
           .append($('<input type="hidden"/>').attr('name', this.options.name)
-            .val(file.id));
+            .val(file.id))
+          .append($('<div class="clear"></div>'));
       if (this.options.deletable) {
         filenode.prepend($('<span><i class="icon-trash"></i></span>')
           .addClass('trash pull-right')
@@ -487,8 +507,10 @@
                 };
             };
 
-            reader.onloadend = !opts.beforeSend ? send : function (e) {
-              opts.beforeSend(files[fileIndex], fileIndex, function () { send(e); });
+            reader.onloadend = function(e) {
+              if (!opts.beforeSend
+                  || false !== opts.beforeSend(files[fileIndex], fileIndex, e.target))
+                return send(e);
             };
 
             reader.readAsBinaryString(files[fileIndex]);