diff --git a/src/domain/session/room/ComposerViewModel.js b/src/domain/session/room/ComposerViewModel.js
index dad0fd68..81a8fc17 100644
--- a/src/domain/session/room/ComposerViewModel.js
+++ b/src/domain/session/room/ComposerViewModel.js
@@ -25,7 +25,7 @@ export class ComposerViewModel extends ViewModel {
     }
 
     setReplyingTo(entry) {
-        const changed = this._replyVM?.id?.equals(entry?.asEventKey());
+        const changed = new Boolean(entry) !== new Boolean(this._replyVM) || !this._replyVM?.id.equals(entry.asEventKey());
         if (changed) {
             this._replyVM = this.disposeTracked(this._replyVM);
             if (entry) {
diff --git a/src/platform/web/ui/session/room/TimelineView.ts b/src/platform/web/ui/session/room/TimelineView.ts
index de2f44fa..3226e05f 100644
--- a/src/platform/web/ui/session/room/TimelineView.ts
+++ b/src/platform/web/ui/session/room/TimelineView.ts
@@ -176,7 +176,6 @@ export class TimelineView extends TemplateView<TimelineViewModel> {
             bottomNodeIndex = len - 1;
         } else {
             const viewportBottom = scrollTop + clientHeight;
-            // console.log(`viewportBottom: ${viewportBottom} (${scrollTop} + ${clientHeight})`);
             const anchoredNodeIndex = findFirstNodeIndexAtOrBelow(tilesNode, viewportBottom);
             this.anchoredNode = tilesNode.childNodes[anchoredNodeIndex] as HTMLElement;
             this.anchoredBottom = bottom(this.anchoredNode!);
diff --git a/src/platform/web/ui/session/room/timeline/BaseMessageView.js b/src/platform/web/ui/session/room/timeline/BaseMessageView.js
index 89127453..e1268cb3 100644
--- a/src/platform/web/ui/session/room/timeline/BaseMessageView.js
+++ b/src/platform/web/ui/session/room/timeline/BaseMessageView.js
@@ -33,6 +33,10 @@ export class BaseMessageView extends TemplateView {
     }
 
     render(t, vm) {
+        const children = [this.renderMessageBody(t, vm)];
+        if (this._interactive) {
+            children.push(t.button({className: "Timeline_messageOptions"}, "⋯"));
+        }
         const li = t.el(this._tagName, {className: {
             "Timeline_message": true,
             own: vm.isOwn,
@@ -40,13 +44,7 @@ export class BaseMessageView extends TemplateView {
             unverified: vm.isUnverified,
             disabled: !this._interactive,
             continuation: vm => vm.isContinuation,
-        }}, [
-            // dynamically added and removed nodes are handled below
-            this.renderMessageBody(t, vm),
-            // should be after body as it is overlayed on top
-            this._interactive ? t.button({className: "Timeline_messageOptions"}, "⋯") : [],
-        ]);
-        const avatar = t.a({href: vm.memberPanelLink, className: "Timeline_messageAvatar"}, [renderStaticAvatar(vm, 30)]);
+        }}, children);
         // given that there can be many tiles, we don't add
         // unneeded DOM nodes in case of a continuation, and we add it
         // with a side-effect binding to not have to create sub views,
@@ -57,8 +55,10 @@ export class BaseMessageView extends TemplateView {
                 li.removeChild(li.querySelector(".Timeline_messageAvatar"));
                 li.removeChild(li.querySelector(".Timeline_messageSender"));
             } else if (!isContinuation) {
+                const avatar = tag.a({href: vm.memberPanelLink, className: "Timeline_messageAvatar"}, [renderStaticAvatar(vm, 30)]);
+                const sender = tag.div({className: `Timeline_messageSender usercolor${vm.avatarColorNumber}`}, vm.displayName);
                 li.insertBefore(avatar, li.firstChild);
-                li.insertBefore(tag.div({className: `Timeline_messageSender usercolor${vm.avatarColorNumber}`}, vm.displayName), li.firstChild);
+                li.insertBefore(sender, li.firstChild);
             }
         });
         // similarly, we could do this with a simple ifView,