diff --git a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
index c34650adb1..8805e31aea 100644
--- a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
+++ b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.swift
@@ -16,6 +16,7 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
     var mastodonController: MastodonController! { delegate?.apiController }
     
     @IBOutlet weak var actionImageView: UIImageView!
+    @IBOutlet weak var verticalStackView: UIStackView!
     @IBOutlet weak var actionAvatarStackView: UIStackView!
     @IBOutlet weak var timestampLabel: UILabel!
     @IBOutlet weak var actionLabel: UILabel!
@@ -70,6 +71,7 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
         let people = group.notificationIDs.compactMap(mastodonController.cache.notification(for:)).map { $0.account }
 
         actionAvatarStackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
+        var imageViews = [UIImageView]()
         for account in people {
             let imageView = UIImageView()
             imageView.translatesAutoresizingMaskIntoConstraints = false
@@ -83,12 +85,19 @@ class ActionNotificationGroupTableViewCell: UITableViewCell {
                 }
             }
             actionAvatarStackView.addArrangedSubview(imageView)
-            NSLayoutConstraint.activate([
-                imageView.widthAnchor.constraint(equalToConstant: 30),
-                imageView.heightAnchor.constraint(equalToConstant: 30)
-            ])
+            imageViews.append(imageView)
+            
+            // don't add more avatars if they would overflow or squeeze the timestamp label
+            let avatarViewsWidth = 30 * CGFloat(imageViews.count)
+            let avatarMarginsWidth = 4 * CGFloat(max(0, imageViews.count - 1))
+            let maxAvatarStackWidth = verticalStackView.bounds.width - timestampLabel.bounds.width - 8
+            let remainingWidth = maxAvatarStackWidth - avatarViewsWidth - avatarMarginsWidth
+            if remainingWidth < 34 {
+                break
+            }
         }
-        
+        NSLayoutConstraint.activate(imageViews.map { $0.widthAnchor.constraint(equalTo: $0.heightAnchor) })
+
         updateTimestamp()
 
         updateActionLabel(people: people)
diff --git a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.xib b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.xib
index b9c06cdb37..cc42d57c56 100644
--- a/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.xib
+++ b/Tusker/Views/Notifications/ActionNotificationGroupTableViewCell.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,19 +19,19 @@
                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="hld-yu-Rmi">
                         <rect key="frame" x="74" y="11" width="230" height="153"/>
                         <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hTQ-P4-gOO">
+                            <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="hTQ-P4-gOO">
                                 <rect key="frame" x="0.0" y="0.0" width="230" height="30"/>
                                 <subviews>
-                                    <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="b7l-YW-nQY">
-                                        <rect key="frame" x="0.0" y="0.0" width="205.5" height="30"/>
+                                    <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" ambiguous="YES" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="b7l-YW-nQY">
+                                        <rect key="frame" x="0.0" y="0.0" width="189.5" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="9uh-oo-JSM"/>
                                         </constraints>
                                     </stackView>
                                     <view contentMode="scaleToFill" horizontalHuggingPriority="249" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Ef-5g-b23">
-                                        <rect key="frame" x="205.5" y="0.0" width="0.0" height="30"/>
+                                        <rect key="frame" x="197.5" y="0.0" width="0.0" height="30"/>
                                     </view>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="2m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JN0-Bf-3qx">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="2m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JN0-Bf-3qx">
                                         <rect key="frame" x="205.5" y="0.0" width="24.5" height="30"/>
                                         <fontDescription key="fontDescription" type="system" weight="light" pointSize="17"/>
                                         <color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
@@ -78,6 +78,7 @@
                 <outlet property="actionLabel" destination="fkn-Gk-ngr" id="bBG-a8-m5G"/>
                 <outlet property="statusContentLabel" destination="lc7-zZ-HrZ" id="jgT-LU-rXt"/>
                 <outlet property="timestampLabel" destination="JN0-Bf-3qx" id="Jlo-f6-DAi"/>
+                <outlet property="verticalStackView" destination="hld-yu-Rmi" id="jvu-1u-Ok3"/>
             </connections>
             <point key="canvasLocation" x="-394.20289855072468" y="56.584821428571423"/>
         </tableViewCell>