diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 8decec0d02..d833f410f4 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1821,10 +1821,10 @@ class Diaspora
 			"to_name" => $importer["username"],
 			"to_email" => $importer["email"],
 			"uid" =>$importer["uid"],
-			"item" => ["subject" => $subject, "body" => $body],
+			"item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body],
 			"source_name" => $person["name"],
 			"source_link" => $person["url"],
-			"source_photo" => $person["thumb"],
+			"source_photo" => $person["photo"],
 			"verb" => ACTIVITY_POST,
 			"otype" => "mail"]
 		);
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 28f44504b6..cb68328531 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -44,7 +44,7 @@ if (!isset($minimal)) {
 			$uid = Profile::getThemeUid();
 		}
 		$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
-		if (($scheme) && ($scheme != '---')) {
+		if ($scheme && ($scheme != '---')) {
 			if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
 				$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
 				require_once $schemefile;
@@ -52,7 +52,7 @@ if (!isset($minimal)) {
 		} else {
 			$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
 		}
-		if (!$nav_bg) {
+		if (empty($nav_bg)) {
 			$nav_bg = "#708fa0";
 		}
 		echo '