diff --git a/src/components/AvatarBubbles.tsx b/src/components/AvatarBubbles.tsx
index 0c6f67db37..ff6f4ba1b9 100644
--- a/src/components/AvatarBubbles.tsx
+++ b/src/components/AvatarBubbles.tsx
@@ -28,7 +28,10 @@ export function AvatarBubbles({
   size = 'large',
 }: Props) {
   const {currentAccount} = useSession()
-  const profiles = allProfiles.filter(p => p.did !== currentAccount?.did)
+  const profiles =
+    allProfiles.length > 2
+      ? allProfiles.filter(p => p.did !== currentAccount?.did)
+      : allProfiles
   const containerSize =
     typeof size === 'number'
       ? size
@@ -86,7 +89,7 @@ export function AvatarBubbles({
   let avatars = (
     <>
       <AvatarBubble
-        profile={profiles[0] ?? allProfiles[0]}
+        profile={profiles[0]}
         scale={p0}
         size={76}
         x={-2}
diff --git a/src/components/dms/MessageItem.tsx b/src/components/dms/MessageItem.tsx
index 7d60cc2a9d..43cf44d7e7 100644
--- a/src/components/dms/MessageItem.tsx
+++ b/src/components/dms/MessageItem.tsx
@@ -168,12 +168,18 @@ let MessageItem = ({
     isInCluster && !effectiveFirstInCluster && !effectiveLastInCluster
 
   const hasReactions = message.reactions && message.reactions.length > 0
+  const prevHasReactions =
+    prevIsMessage &&
+    prevMessage.reactions != null &&
+    prevMessage.reactions.length > 0
   const squaredBottomCorner =
     !hasReactions &&
     isInCluster &&
     (isInMiddleOfCluster || effectiveFirstInCluster)
   const squaredTopCorner =
-    isInCluster && (isInMiddleOfCluster || effectiveLastInCluster)
+    !prevHasReactions &&
+    isInCluster &&
+    (isInMiddleOfCluster || effectiveLastInCluster)
 
   const pendingColor = t.palette.primary_300
 
diff --git a/src/screens/Messages/ConversationSettings.tsx b/src/screens/Messages/ConversationSettings.tsx
index be0ee06a58..e63ccc3ef0 100644
--- a/src/screens/Messages/ConversationSettings.tsx
+++ b/src/screens/Messages/ConversationSettings.tsx
@@ -919,7 +919,6 @@ function SettingsHeader({
 
 function SettingsHeaderPlaceholder() {
   const t = useTheme()
-  const {t: l} = useLingui()
 
   return (
     <View style={[a.px_xl, a.py_4xl, a.border_b, t.atoms.border_contrast_low]}>
@@ -928,7 +927,7 @@ function SettingsHeaderPlaceholder() {
       </View>
       <Text
         style={[a.text_2xl, a.font_bold, a.text_center, a.pt_lg, t.atoms.text]}>
-        {l`…`}
+        …
       </Text>
       <Text
         style={[
@@ -1015,7 +1014,7 @@ function SettingsButtonPlaceholder() {
           a.pt_xs,
           t.atoms.text,
         ]}>
-        {l`…`}
+        …
       </Text>
     </View>
   )
diff --git a/src/screens/Messages/components/MessageListError.tsx b/src/screens/Messages/components/MessageListError.tsx
index 3b424cb395..b922ba6121 100644
--- a/src/screens/Messages/components/MessageListError.tsx
+++ b/src/screens/Messages/components/MessageListError.tsx
@@ -43,6 +43,7 @@ export function MessageListError({item}: {item: ConvoItem & {type: 'error'}}) {
           {description}
           {item.retry && (
             <>
+              {' '}
               &middot;{' '}
               <InlineLinkText
                 label={help}