diff --git a/application/controllers/UploaderController.php b/application/controllers/UploaderController.php
index 486bf78b0c3..b27f1d19db7 100644
--- a/application/controllers/UploaderController.php
+++ b/application/controllers/UploaderController.php
@@ -33,7 +33,7 @@ function run()
 		    elseif(substr($sFileName,0,3)=='fu_'){
 		        $sFileDir = "{$uploaddir}/surveys/{$surveyid}/files/";
 		    }
-            header('Content-Type: '.mime_content_type($sFileDir.$sFileName));
+            header('Content-Type: '. CFileHelper::getMimeType($sFileDir.$sFileName));
 		    readfile($sFileDir.$sFileName);
 		    exit();
 		}
@@ -103,6 +103,11 @@ function run()
 			$clang = Yii::app()->lang;
 
 		    $sTempUploadDir = $tempdir.'/upload/';
+            // Check if exists and is writable
+            if (!file_exists($sTempUploadDir)) {
+                // Try to create
+                mkdir($sTempUploadDir);
+            }
 		    $filename = $_FILES['uploadfile']['name'];
 		    $size = 0.001 * $_FILES['uploadfile']['size'];
 		    $valid_extensions = strtolower($_POST['valid_extensions']);
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index ffc78b8d1cf..b38d8d89a03 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -2867,6 +2867,7 @@ function upload_$ia[1]() {
              headFileName: '" . $clang->gT('File name','js') . "'
             };
         var imageurl =  '".Yii::app()->getConfig('imageurl')."';
+        var uploadurl =  '".$scriptloc."';
     </script>\n";
     header_includes(Yii::app()->getConfig('generalscripts')."modaldialog.js");
 
diff --git a/scripts/modaldialog.js b/scripts/modaldialog.js
index bd6199d46cc..88b130238a5 100644
--- a/scripts/modaldialog.js
+++ b/scripts/modaldialog.js
@@ -179,14 +179,14 @@ function displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show
             if (pos)
                 {
                 if (isValueInArray(image_extensions, jsonobj[i].ext))
-                    display += '<tr><td class="upload image"><img src="/uploader/index/sid/'+surveyid+'/filegetcontents/'+decodeURIComponent(jsonobj[i].filename)+'" height=100px /></td>';
+                    display += '<tr><td class="upload image"><img src="' + uploadurl + '/sid/'+surveyid+'/filegetcontents/'+decodeURIComponent(jsonobj[i].filename)+'" height=100px /></td>';
                 else
                     display += '<tr><td class="upload placeholder"><img src="'+imageurl+'/placeholder.png" height=100px /></td>';
             }
             else
                 {
                 if (isValueInArray(image_extensions, jsonobj[i].ext))
-                    display += '<tr><td class="upload image"><img src="/uploader/index/filegetcontents/'+decodeURIComponent(jsonobj[i].filename)+'" height=100px /></td>';
+                    display += '<tr><td class="upload image"><img src="' + uploadurl + 'filegetcontents/'+decodeURIComponent(jsonobj[i].filename)+'" height=100px /></td>';
                 else
                     display += '<tr><td class="upload placeholder"><img src="'+imageurl+'/placeholder.png" height=100px /></td>';
             }