diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 34c932f745..69a87b3817 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -34,6 +34,15 @@ function diaspora2bb($s) {
 
 	$s = str_replace('#','#',$s);
 
+	$search = array(" \n", "\n ");
+	$replace = array("\n", "\n");
+	do {
+		$oldtext = $s;
+		$s = str_replace($search, $replace, $s);
+	} while ($oldtext != $s);
+
+	$s = str_replace("\n\n", "<br>", $s);
+
 	$s = html2bbcode($s);
 
 	// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
diff --git a/include/bbcode.php b/include/bbcode.php
index 6c5a400ddc..e872d859c5 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -887,8 +887,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$MAILSearchString = $URLSearchString;
 
 	// Remove all hashtag addresses
-	if ((!$tryoembed OR $simplehtml) AND ($simplehtml != 7))
+	if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7)))
 		$Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+	elseif ($simplehtml == 3)
+		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+			'$1<a href="$2">$3</a>',
+			$Text);
 	elseif ($simplehtml == 7)
 		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',
diff --git a/include/diaspora.php b/include/diaspora.php
index b70cffdc39..534e2541cb 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1,5 +1,10 @@
 <?php
 
+/*
+To-Do:
+- GET /people/9aed8882b9f64896/stream
+*/
+
 require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/bb2diaspora.php');
diff --git a/include/notifier.php b/include/notifier.php
index 24dc63d696..67d5cdbbd8 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -406,9 +406,13 @@ function notifier_run(&$argv, &$argc){
 					}
 				}
 			}
-		}
 
-		$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
+			// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
+			$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
+		} else
+			$sql_extra = "";
+
+		$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0".$sql_extra);
 
 		if(count($r))
 			$contacts = $r;
diff --git a/object/Item.php b/object/Item.php
index 3211048cef..75f99742eb 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -325,7 +325,7 @@ class Item extends BaseObject {
 			'body' => $body_e,
 			'text' => $text_e,
 			'id' => $this->get_id(),
-			'guid' => $item['guid'],
+			'guid' => urlencode($item['guid']),
 			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
 			'to' => t('to'),
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 64edef3012..79309e338e 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1216,6 +1216,7 @@ section.minimal {
 
 .wall-item-container .wall-item-content img {
   max-width: 100%;
+  vertical-align: middle;
   /* max-width: 650px; */
   /* max-width: 580px; */
 }