diff --git a/include/conversation.php b/include/conversation.php
index baf7633a77..6adc00d0c4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -697,6 +697,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 		'$live_update' => $live_update_div,
 		'$remove' => DI::l10n()->t('remove'),
 		'$mode' => $mode,
+		'$update' => $update,
 		'$user' => $a->user,
 		'$threads' => $threads,
 		'$dropping' => ($page_dropping ? DI::l10n()->t('Delete Selected Items') : False),
diff --git a/view/js/main.js b/view/js/main.js
index b523ce6e70..89c4e91f66 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -620,6 +620,12 @@ function liveUpdate(src) {
 		in_progress = false;
 		update_item = 0;
 
+		if (data.length < 100) {
+			// console.log('No data ' + data.length + ':' + data);
+			return;
+		}
+		// console.log('Got data: ' + data.length + ':' + data);
+
 		$('.wall-item-body', data).imagesLoaded(function() {
 			updateConvItems(data);
 
diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl
index 5a4ca2d634..761a31a842 100644
--- a/view/templates/conversation.tpl
+++ b/view/templates/conversation.tpl
@@ -1,6 +1,4 @@
-
 {{$live_update nofilter}}
-
 {{foreach $threads as $thread}}
 <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
 	{{foreach $thread.items as $item}}
@@ -18,7 +16,7 @@
 	{{/foreach}}
 </div>
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -28,3 +26,4 @@
 </div>
 <div id="item-delete-selected-end"></div>
 {{/if}}
+{{/if}}
diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
index d993c6b33b..f4a47354ed 100644
--- a/view/templates/threaded_conversation.tpl
+++ b/view/templates/threaded_conversation.tpl
@@ -1,10 +1,8 @@
-
 {{$live_update nofilter}}
-
 {{foreach $threads as $thread}}
 {{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -15,3 +13,4 @@
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 <div id="item-delete-selected-end"></div>
 {{/if}}
+{{/if}}
diff --git a/view/theme/frio/templates/threaded_conversation.tpl b/view/theme/frio/templates/threaded_conversation.tpl
index f618da2817..de5522fa9b 100644
--- a/view/theme/frio/templates/threaded_conversation.tpl
+++ b/view/theme/frio/templates/threaded_conversation.tpl
@@ -1,8 +1,6 @@
-<script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+{{if !$update}}<script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>{{/if}}
 {{if $mode == display}}<script type="text/javascript" src="view/theme/frio/js/mod_display.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>{{/if}}
-
 {{$live_update nofilter}}
-
 {{foreach $threads as $thread}}
 <hr class="sr-only" />
 <div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{$thread.network}} {{if $thread.thread_level==1}}panel-default panel{{/if}} {{if $thread.thread_level!=1}}comment-wrapper{{/if}}" style="{{if $item.thread_level>2}}margin-left: -15px; margin-right:-16px; margin-bottom:-16px;{{/if}}"><!-- panel -->
@@ -15,7 +13,7 @@
 
 </div><!--./tread-wrapper-->
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -24,3 +22,4 @@
 </button>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 {{/if}}
+{{/if}}
diff --git a/view/theme/quattro/templates/conversation.tpl b/view/theme/quattro/templates/conversation.tpl
index ce89d579ea..7e7f8cea89 100644
--- a/view/theme/quattro/templates/conversation.tpl
+++ b/view/theme/quattro/templates/conversation.tpl
@@ -1,5 +1,4 @@
 {{$live_update nofilter}}
-
 {{foreach $threads as $thread}}
 <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
 	{{foreach $thread.items as $item}}
@@ -23,7 +22,7 @@
 	{{/foreach}}
 </div>
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -46,4 +45,4 @@
     $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);
 </script>
 {{/if}}
-
+{{/if}}
diff --git a/view/theme/quattro/templates/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl
index 33431361f6..640ecbfd0d 100644
--- a/view/theme/quattro/templates/threaded_conversation.tpl
+++ b/view/theme/quattro/templates/threaded_conversation.tpl
@@ -1,5 +1,4 @@
 {{$live_update nofilter}}
-
 {{foreach $threads as $thread}}
 
 <div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}} {{if $thread.toplevel}} h-entry  {{else}} u-comment h-cite {{/if}} {{$thread.network}}">
@@ -13,7 +12,7 @@
 
 </div>
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -37,4 +36,4 @@
     $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);
 </script>
 {{/if}}
-
+{{/if}}
diff --git a/view/theme/vier/templates/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl
index 35807f9912..de35497d24 100644
--- a/view/theme/vier/templates/threaded_conversation.tpl
+++ b/view/theme/vier/templates/threaded_conversation.tpl
@@ -1,5 +1,4 @@
 {{$live_update nofilter}}
-
 {{foreach $threads as $thread}}
 <hr class="sr-only" />
 <div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}} {{if $thread.toplevel}}h-entry{{/if}} {{$thread.network}}">
@@ -13,7 +12,7 @@
 		
 </div>
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -37,4 +36,4 @@
     $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
 </script>
 {{/if}}
-
+{{/if}}