diff --git a/include/onepoll.php b/include/onepoll.php
index c493aff762..d819b7f421 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -398,14 +398,15 @@ function onepoll_run(&$argv, &$argc){
 						// Is it a reply?
 						$reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
 							(substr(strtolower($datarray['title']), 0, 3) == "re-") or
-							(raw_refs != ""));
+							($raw_refs != ""));
 
 						// Remove Reply-signs in the subject
 						$datarray['title'] = RemoveReply($datarray['title']);
 
 						// If it seems to be a reply but a header couldn't be found take the last message with matching subject
 						if(!x($datarray,'parent-uri') and $reply) {
-							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+							//$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE MATCH (`title`) AGAINST ('".'"%s"'."' IN BOOLEAN MODE) AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
+							$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d ORDER BY `created` DESC LIMIT 1",
 								dbesc(protect_sprintf($datarray['title'])),
 								intval($importer_uid));
 							if(count($r))
diff --git a/mod/admin.php b/mod/admin.php
index aeff87f828..41147fa010 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -279,6 +279,7 @@ function admin_page_site_post(&$a){
 	$itemcache_duration	=	((x($_POST,'itemcache_duration'))	? intval($_POST['itemcache_duration'])		: 0);
 	$lockpath		=	((x($_POST,'lockpath'))			? notags(trim($_POST['lockpath']))		: '');
 	$temppath		=	((x($_POST,'temppath'))			? notags(trim($_POST['temppath']))		: '');
+	$basepath		=	((x($_POST,'basepath'))			? notags(trim($_POST['basepath']))		: '');
 
 	if($ssl_policy != intval(get_config('system','ssl_policy'))) {
 		if($ssl_policy == SSL_POLICY_FULL) {
@@ -384,6 +385,7 @@ function admin_page_site_post(&$a){
 	set_config('system','itemcache_duration', $itemcache_duration);
 	set_config('system','lockpath', $lockpath);
 	set_config('system','temppath', $temppath);
+	set_config('system','basepath', $basepath);
 
 
 	info( t('Site settings updated.') . EOL);
@@ -509,6 +511,7 @@ function admin_page_site(&$a) {
 		'$itemcache_duration' 	=> array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")),
 		'$lockpath'		=> array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
 		'$temppath'		=> array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
+		'$basepath'		=> array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
 
         '$form_security_token' => get_form_security_token("admin_site"),
 
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index ae550057d1..7e442cdfb1 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -93,6 +93,7 @@
 	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
+	{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
 
 	<h3>$performance</h3>
 	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}