diff --git a/Mastodon/Scene/Notification/Cell/NotificationTableViewCell.swift b/Mastodon/Scene/Notification/Cell/NotificationTableViewCell.swift
index fe2f8736..bbdb2afa 100644
--- a/Mastodon/Scene/Notification/Cell/NotificationTableViewCell.swift
+++ b/Mastodon/Scene/Notification/Cell/NotificationTableViewCell.swift
@@ -50,13 +50,13 @@ extension NotificationTableViewCell {
         notificationView.translatesAutoresizingMaskIntoConstraints = false
         contentView.addSubview(notificationView)
         setupContainerViewMarginConstraints()
-        updateContainerViewMarginConstraints()
         NSLayoutConstraint.activate([
             notificationView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 16),
             containerViewLeadingLayoutConstraint,
             containerViewTrailingLayoutConstraint,
             contentView.bottomAnchor.constraint(equalTo: notificationView.bottomAnchor),
         ])
+        updateContainerViewMarginConstraints()
         
         separatorLine.translatesAutoresizingMaskIntoConstraints = false
         contentView.addSubview(separatorLine)
@@ -78,6 +78,12 @@ extension NotificationTableViewCell {
         notificationView.delegate = self
     }
     
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        
+        updateContainerViewMarginConstraints()
+    }
+    
 }
 
 // MARK: - AdaptiveContainerMarginTableViewCell
diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift b/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift
index 265a46aa..8827eada 100644
--- a/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift
+++ b/MastodonSDK/Sources/MastodonUI/View/Content/NotificationView.swift
@@ -57,6 +57,7 @@ public final class NotificationView: UIView {
     }()
     
     // author
+    let authorAdaptiveMarginContainerView = AdaptiveMarginContainerView()
     let authorContainerView: UIStackView = {
         let stackView = UIStackView()
         stackView.axis = .horizontal
@@ -148,9 +149,10 @@ extension NotificationView {
         ])
         
         // author container: H - [ avatarButton | author meta container ]
-        authorContainerView.preservesSuperviewLayoutMargins = true
-        authorContainerView.isLayoutMarginsRelativeArrangement = true
-        containerStackView.addArrangedSubview(authorContainerView)
+        authorAdaptiveMarginContainerView.contentView = authorContainerView
+        authorAdaptiveMarginContainerView.margin = StatusView.containerLayoutMargin
+        containerStackView.addArrangedSubview(authorAdaptiveMarginContainerView)
+        
         UIContentSizeCategory.publisher
             .sink { [weak self] category in
                 guard let self = self else { return }
@@ -226,7 +228,7 @@ extension NotificationView {
         
         // quoteStatusView
         containerStackView.addArrangedSubview(quoteStatusViewContainerView)
-        quoteStatusViewContainerView.layoutMargins.bottom = 16
+        quoteStatusViewContainerView.layoutMargins = UIEdgeInsets(top: 0, left: 0, bottom: 16, right: 0)
 
         quoteBackgroundView.layoutMargins = UIEdgeInsets(top: 16, left: 0, bottom: 0, right: 0)
         quoteBackgroundView.translatesAutoresizingMaskIntoConstraints = false
@@ -294,6 +296,11 @@ extension NotificationView {
 // MARK: - AdaptiveContainerView
 extension NotificationView: AdaptiveContainerView {
     public func updateContainerViewComponentsLayoutMarginsRelativeArrangementBehavior(isEnabled: Bool) {
+        let margin = isEnabled ? StatusView.containerLayoutMargin : .zero
+        authorAdaptiveMarginContainerView.margin = margin
+        quoteStatusViewContainerView.layoutMargins.left = margin
+        quoteStatusViewContainerView.layoutMargins.right = margin
+        
         statusView.updateContainerViewComponentsLayoutMarginsRelativeArrangementBehavior(isEnabled: isEnabled)
         quoteStatusView.updateContainerViewComponentsLayoutMarginsRelativeArrangementBehavior(isEnabled: true)  // always set margins
     }