diff --git a/htconfig.php b/htconfig.php
index ab9a7ca506..bb0f47727a 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -91,3 +91,6 @@ $a->config['system']['lockpath'] = "";
 
 // If enabled, the MyBB fulltext engine is used
 // $a->config['system']['use_fulltext_engine'] = true;
+
+// Let reshared messages look like wall-to-wall posts
+// $a->config['system']['diaspora_newreshare'] = true;
diff --git a/include/diaspora.php b/include/diaspora.php
index 6a8d4a3581..c2b2fbcf4e 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -963,8 +963,8 @@ function diaspora_reshare($importer,$xml,$msg) {
 		$details = '[url=' . $person['url'] . ']' . $person['name'] . '[/url]';
 	else
 		$details = $orig_author;
-	
-	$prefix = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . $details . "\n"; 
+
+	$prefix = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . $details . "\n";
 
 
 	// allocate a guid on our system - we aren't fixing any collisions.
@@ -1023,12 +1023,21 @@ function diaspora_reshare($importer,$xml,$msg) {
 	$datarray['owner-name'] = $contact['name'];
 	$datarray['owner-link'] = $contact['url'];
 	$datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
-	$datarray['author-name'] = $person['name']; // Let reshared messages look like wall-to-wall posts
-	$datarray['author-link'] = $person['url']; // we have to set an additional value in the item in the future
-	// $datarray['author-avatar'] = $person['thumb']; // to distinct the wall-to-wall-posts from reshared/repeated messages
-	$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
-	// $datarray['body'] = $prefix . $body;
-	$datarray['body'] = $body;
+	if (intval(get_config('system','diaspora_newreshare'))) {
+		// Let reshared messages look like wall-to-wall posts
+		// we have to set an additional value in the item in the future
+		// to distinct the wall-to-wall-posts from reshared/repeated messages
+		$datarray['author-name'] = $person['name'];
+		$datarray['author-link'] = $person['url'];
+		$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
+		$datarray['body'] = $body;
+	} else {
+		$datarray['author-name'] = $contact['name'];
+		$datarray['author-link'] = $contact['url'];
+		$datarray['author-avatar'] = $contact['thumb'];
+		$datarray['body'] = $prefix . $body;
+	}
+
 	$datarray['tag'] = $str_tags;
 	$datarray['app']  = 'Diaspora';