diff --git a/Signal/src/ViewControllers/HomeView/ConversationListCell.swift b/Signal/src/ViewControllers/HomeView/ConversationListCell.swift
index 6051119467..4abc94d10b 100644
--- a/Signal/src/ViewControllers/HomeView/ConversationListCell.swift
+++ b/Signal/src/ViewControllers/HomeView/ConversationListCell.swift
@@ -294,7 +294,7 @@ public class ConversationListCell: UITableViewCell {
             let snippetFrame = CGRect(x: 0,
                                       y: 0,
                                       width: view.width,
-                                      height: ceil(snippetSize.height))
+                                      height: min(view.bounds.height, ceil(snippetSize.height)))
             self.snippetLabel.frame = snippetFrame
         }
         let typingIndicatorSize = TypingIndicatorView.measurement().measuredSize