diff --git a/src/main/scala/app/FileUploadController.scala b/src/main/scala/app/FileUploadController.scala
index 4b625a256..ad8ea2829 100644
--- a/src/main/scala/app/FileUploadController.scala
+++ b/src/main/scala/app/FileUploadController.scala
@@ -25,7 +25,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport {
 
   post("/image/:owner/:repository"){
     execute { (file, fileId) =>
-
+      FileUtils.writeByteArrayToFile(new java.io.File(getAttachedDir(params("owner"), params("repository")), fileId), file.get)
     }
   }
 
diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala
index 79ba33cd0..a72fd78eb 100644
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -274,8 +274,7 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
-    println("----" + params("file"))
-
+    new java.io.File(Directory.getAttachedDir(repository.owner, repository.name), params("file"))
   })
 
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
diff --git a/src/main/twirl/helper/preview.scala.html b/src/main/twirl/helper/preview.scala.html
index 478a4084e..7a7c0718d 100644
--- a/src/main/twirl/helper/preview.scala.html
+++ b/src/main/twirl/helper/preview.scala.html
@@ -52,9 +52,8 @@ $(function(){
       maxFilesize: 10,
       previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your images...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
       success: function(file, id) {
-        var index = file.name.indexOf('.');
-        $('#content').val($('#content').val() +
-            '\n![' + file.name.substring(0, index) + '](@url(repository)/_attached/' + id + file.name.substring(index) +  ')');
+        var images = '\n![' + file.name.split('.')[0] + '](@url(repository)/_attached/' + id + ')';
+        $('#content').val($('#content').val() + images);
         file.previewElement.remove();
       }
     });