diff --git a/Session/Conversations/Message Cells/Content Views/QuoteView.swift b/Session/Conversations/Message Cells/Content Views/QuoteView.swift
index e24bbeb14..99946ec16 100644
--- a/Session/Conversations/Message Cells/Content Views/QuoteView.swift	
+++ b/Session/Conversations/Message Cells/Content Views/QuoteView.swift	
@@ -178,7 +178,9 @@ final class QuoteView : UIView {
             imageView.set(.width, to: thumbnailSize)
             imageView.set(.height, to: thumbnailSize)
             mainStackView.addArrangedSubview(imageView)
-            body = (thumbnail != nil) ? "Image" : (isAudio ? "Audio" : "Document")
+            if (body ?? "").isEmpty {
+                body = (thumbnail != nil) ? "Image" : (isAudio ? "Audio" : "Document")
+            }
         }
         // Body label
         let bodyLabel = UILabel()
@@ -189,9 +191,11 @@ final class QuoteView : UIView {
         bodyLabel.attributedText = given(body) { MentionUtilities.highlightMentions(in: $0, isOutgoingMessage: isOutgoing, threadID: threadID, attributes: [:]) }
             ?? given(attachments.first?.contentType) { NSAttributedString(string: MIMETypeUtil.isAudio($0) ? "Audio" : "Document") } ?? NSAttributedString(string: "Document")
         bodyLabel.textColor = textColor
+        /*
         if hasAttachments {
             bodyLabel.numberOfLines = 1
         }
+        */
         let bodyLabelSize = bodyLabel.systemLayoutSizeFitting(availableSpace)
         // Label stack view
         var authorLabelHeight: CGFloat?
diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift
index 9c0eb271c..82d11d47e 100644
--- a/Session/Conversations/Message Cells/VisibleMessageCell.swift	
+++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift	
@@ -561,7 +561,8 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
         switch viewItem.interaction.interactionType() {
         case .outgoingMessage: return screen.width - contactThreadHSpacing - gutterSize
         case .incomingMessage:
-            let leftGutterSize = shouldShowProfilePicture(for: viewItem) ? gutterSize : contactThreadHSpacing
+            let isGroupThread = viewItem.interaction.thread.isGroupThread()
+            let leftGutterSize = isGroupThread ? gutterSize : contactThreadHSpacing
             return screen.width - leftGutterSize - gutterSize
         default: preconditionFailure()
         }