diff --git a/Tusker/Screens/Gallery/GalleryViewController.swift b/Tusker/Screens/Gallery/GalleryViewController.swift
index 034316f550..d582d7dda4 100644
--- a/Tusker/Screens/Gallery/GalleryViewController.swift
+++ b/Tusker/Screens/Gallery/GalleryViewController.swift
@@ -32,8 +32,7 @@ class GalleryViewController: UIPageViewController, UIPageViewControllerDataSourc
         return true
     }
     override var childForHomeIndicatorAutoHidden: UIViewController? {
-        return
-            viewControllers?.first
+        return viewControllers?.first
     }
     
     init(attachments: [Attachment], sourcesInfo: [LargeImageViewController.SourceInfo?], startIndex: Int) {
diff --git a/Tusker/Views/Status/StatusTableViewCell.swift b/Tusker/Views/Status/StatusTableViewCell.swift
index b92b801a39..5f971bb935 100644
--- a/Tusker/Views/Status/StatusTableViewCell.swift
+++ b/Tusker/Views/Status/StatusTableViewCell.swift
@@ -152,6 +152,13 @@ class StatusTableViewCell: UITableViewCell {
         setCollapsed(collapsible, animated: false)
         contentWarningLabel.text = status.spoilerText
         contentWarningLabel.isHidden = status.spoilerText.isEmpty
+
+        if !collapsed,
+            let text = contentLabel.text,
+            text.count > 500 {
+            collapsible = true
+            setCollapsed(true, animated: false)
+        }
         
         let pinned = status.pinned ?? false
         pinImageView.isHidden = !(pinned && showPinned)