diff --git a/js/dom-functions.js b/js/dom-functions.js
index 59b9eb1..08b7317 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -2038,6 +2038,11 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
 	statusnetHTML = placeQuotedNoticesInQueetText(attachmentBuild.quotedNotices, statusnetHTML);
 	statusnetHTML = statusnetHTML.html();
 
+	// remove trailing <br>s from queet text
+	while (statusnetHTML.slice(-4) == '<br>') {
+		statusnetHTML = statusnetHTML.slice(0,-4);
+		}
+
 	// external
 	var ostatusHtml = '';
 	if(obj.is_local === false) {