diff --git a/js/dom-functions.js b/js/dom-functions.js
index bd7f051..b9e5285 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -1218,22 +1218,23 @@ function expand_queet(q,doScrolling) {
 			}
 		}
 	}
-function cleanUpAfterCollapseQueet(q) {
-	q.css('height','auto');
-	q.children('.queet').css('margin-top','0');
-	q.removeClass('expanded');
-	q.prev().removeClass('next-expanded');
-	q.removeClass('collapsing');
-	q.find('.expanded-content').remove();
-	q.find('.view-more-container-top').remove();
-	q.find('.view-more-container-bottom').remove();
-	q.find('.inline-reply-queetbox').remove();
-	q.find('.stream-item.conversation').remove();
-	q.find('.show-full-conversation').remove();
-	q.removeAttr('style');
-	q.children('.queet').removeAttr('style');
-	q.children('.queet').find('.queet-thumbs.thumb-num-1').removeAttr('style');
-	q.children('.queet').find('.queet-thumbs.thumb-num-1 .thumb-container').css('max-height','');
+function cleanUpAfterCollapseQueet(streamItem) {
+	var queet = streamItem.children('.queet');
+	streamItem.css('height','auto');
+	streamItem.children('.queet').css('margin-top','0');
+	streamItem.removeClass('expanded');
+	streamItem.prev().removeClass('next-expanded');
+	streamItem.removeClass('collapsing');
+	streamItem.find('.expanded-content').remove();
+	streamItem.find('.view-more-container-top').remove();
+	streamItem.find('.view-more-container-bottom').remove();
+	streamItem.find('.inline-reply-queetbox').remove();
+	streamItem.find('.stream-item.conversation').remove();
+	streamItem.find('.show-full-conversation').remove();
+	streamItem.removeAttr('style');
+	queet.removeAttr('style');
+	queet.find('.queet-thumbs.thumb-num-1').removeAttr('style');
+	queet.find('.queet-thumbs.thumb-num-1 .thumb-container').css('max-height','');
 	}
 
 
diff --git a/js/misc-functions.js b/js/misc-functions.js
index ddf8d0a..a51b44b 100644
--- a/js/misc-functions.js
+++ b/js/misc-functions.js
@@ -939,16 +939,13 @@ function rememberStreamStateInLocalStorage() {
 				}
 			});
 		var feed = $('<div/>').append(firstTwentyVisibleHTML);
-		feed.find('.view-more-container-top').remove();
-		feed.find('.view-more-container-bottom').remove();
-		feed.find('.stream-item.conversation').remove();
-		feed.find('.expanded-content').remove();
 		feed.find('.temp-post').remove();
-		feed.find('.inline-reply-queetbox').remove();
 		feed.children('.stream-item').removeClass('not-seen');
 		feed.children('.stream-item').removeClass('selected-by-keyboard');
-		feed.find('.show-full-conversation').remove();
 		feed.find('.stream-item').removeClass('expanded').removeClass('next-expanded').removeClass('hidden').removeClass('collapsing').addClass('visible');
+		$.each(feed, function(k,streamItem) {
+			cleanUpAfterCollapseQueet($(streamItem));
+			});
 		var feedHtml = feed.html();
 		var profileCardHtml = $('#feed').siblings('.profile-card').outerHTML();
 		var streamData = {