diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index ef9e4f1793..f430d9e47a 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -90,6 +90,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		$items = array_reverse($conv_as->items);
 
 		foreach ($items as $single_conv) {
+			if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
+				$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+
+			if (@!$single_conv->id)
+				continue;
+
 			if ($first_id == "") {
 				$first_id = $single_conv->id;
 
diff --git a/index.php b/index.php
index 40551f3881..8e2376e918 100644
--- a/index.php
+++ b/index.php
@@ -183,6 +183,10 @@ if(strlen($a->module)) {
 	 *
 	 */
 
+	// Compatibility with the Android Diaspora client
+	if ($a->module == "stream")
+		$a->module = "network";
+
 	if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
 		include_once("addon/{$a->module}/{$a->module}.php");
 		if(function_exists($a->module . '_module'))
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ebcab5a144..fe9ec459cc 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -291,7 +291,7 @@ body {
   background-color: #F2F2F2;
   color: #2d2d2d;
   /* margin: 37px 0px 0px 0px; */
-  margin: 32px 0px 0px 0px;
+  margin: 0px 0px 0px 0px;
   display: table;
   /* width: 100% */
 }
@@ -849,6 +849,7 @@ ul.menu-popup .empty {
 
 right_aside {
   width: 0px;
+  top: 32px;
   display: block;
 }
 
@@ -857,12 +858,20 @@ aside {
   /* display: table-cell; */
   vertical-align: top;
   width: 185px;
-  padding: 10px 10px 10px 20px;
+  padding: 32px 10px 10px 20px;
   /* border-right: 1px solid #D2D2D2; */
   /* background-color: #ECECF2; */
   background-color: #F2F2F2;
   font-size: 13px;
   /* background: #F1F1F1; */
+  top: 0px;
+  overflow-y: auto;
+  z-index: 2;
+
+  position: fixed;
+  /* overflow: auto; */
+  height: 100%;
+  /* overflow: scroll; */
 }
 aside .vcard .fn {
   font-size: 18px;
@@ -1062,6 +1071,7 @@ aside h4 {
 section {
   display: table-cell;
   vertical-align: top;
+  top: 32px;
   width: 766px;
   max-width: 766px;
   padding: 10px 10px 10px 10px;
@@ -1069,6 +1079,9 @@ section {
   border-bottom: 1px solid lightgray;
   border-right: 1px solid lightgray;
   border-left: 1px solid lightgray;
+
+  position: absolute;
+  left: 215px;
 }
 /* wall item */
 .tread-wrapper {