diff --git a/actions/qvitter.php b/actions/qvitter.php
index 0cc23e4..9d5c288 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -84,7 +84,15 @@ class QvitterAction extends ApiAction
 		$siterootdomain = common_config('site','server');
 		$qvitterpath = Plugin::staticPath('Qvitter', '');
 		$apiroot = common_path('api/', StatusNet::isHTTPS());
-		$attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
+
+		$attachmentconfig=common_config('attachments');
+		if(StatusNet::isHTTPS() && $attachmentconfig['sslserver']){
+			$attachmentroot ='https://'.$attachmentconfig['sslserver'].$attachmentconfig['path'];
+		} elseif(!StatusNet::isHTTPS() && $attachmentconfig['server']) {
+			$attachmentroot ='http://'.$attachmentconfig['server'].$attachmentconfig['path'];
+		} else {
+			$attachmentroot = common_path('attachment/', StatusNet::isHTTPS());
+		}
 		$instanceurl = common_path('', StatusNet::isHTTPS());
         $favicon_path = QvitterPlugin::settings("favicon_path");
 
diff --git a/js/misc-functions.js b/js/misc-functions.js
index 06f9663..76ce067 100644
--- a/js/misc-functions.js
+++ b/js/misc-functions.js
@@ -730,7 +730,12 @@ function isLocalURL(url) {
 		return true;
 		}
 	else {
-		return false;
+		if(url.substring(0,window.siteAttachmentURLBase.length) == window.siteAttachmentURLBase) {
+			return true;
+			}
+		else {
+			return false;
+			}
 		}
 	}