diff --git a/Mail/Views/Thread/MessageListView.swift b/Mail/Views/Thread/MessageListView.swift
index e860f19f8..d2374f000 100644
--- a/Mail/Views/Thread/MessageListView.swift
+++ b/Mail/Views/Thread/MessageListView.swift
@@ -28,7 +28,7 @@ struct MessageListView: View {
             ForEach(messages, id: \.uid) { message in
                 let isMessageExpanded = ((messages.last?.uid == message.uid) && !message.isDraft) || !message.seen
                 MessageView(message: message, isMessageExpanded: isMessageExpanded)
-                    .id(message.uid)
+                    .padding(.horizontal, messages.count > 1 ? 8 : 0)
             }
         }
     }