diff --git a/.htaccess b/.htaccess
index eb30198bb2..e17ea00b2a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,6 +2,10 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 
+<FilesMatch "\.out">
+Deny from all
+</FilesMatch>
+
 <IfModule mod_rewrite.c>
   RewriteEngine on
 
diff --git a/include/dba.php b/include/dba.php
index 9e44db5fbb..0e790d4c1c 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -57,6 +57,10 @@ class dba {
 					break;
 			}
 		}
+		else {
+			if(($result === false) && (file_exists('dbfail.out')))
+				file_put_contents('dbfail.out', printable($sql) . ' returned false' . "\n", FILE_APPEND);
+		}
 
 		if(($result === true) || ($result === false))
 			return $result;
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index d657b1f88e..4a23da5050 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -117,8 +117,8 @@ function dfrn_notify_post(&$a) {
 				'$username' => $importer['username'],
 				'$email' => $importer['email'],
 				'$from' => $msg['from-name'],
-				'$title' => $msg['title'],
-				'$body' => strip_tags(bbcode($msg['body']))
+				'$title' => stripslashes($msg['title']),
+				'$body' => strip_tags(bbcode(stripslashes($msg['body'])))
 			));
 
 			$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],