Tusker/Views/ContentTextView.swift

@@ -109,20 +109,10 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
             case "p":
                 attributed.append(NSAttributedString(string: "\n\n"))
             case "em", "i":
-                let currentFont: UIFont
+                let currentFont: UIFont = attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? self.font!
-                if attributed.length == 0 {
-                    currentFont = defaultFont
-                } else {
-                    currentFont = attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? defaultFont
-                }
                 attributed.addAttribute(.font, value: currentFont.withTraits(.traitItalic)!, range: attributed.fullRange)
             case "strong", "b":
-                let currentFont: UIFont
+                let currentFont: UIFont = attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? self.font!
-                if attributed.length == 0 {
-                    currentFont = defaultFont
-                } else {
-                    currentFont = attributed.attribute(.font, at: 0, effectiveRange: nil) as? UIFont ?? defaultFont
-                }
                 attributed.addAttribute(.font, value: currentFont.withTraits(.traitBold)!, range: attributed.fullRange)
             case "del":
                 attributed.addAttribute(.strikethroughStyle, value: NSUnderlineStyle.single.rawValue, range: attributed.fullRange)

Tusker/Views/Status/TimelineStatusTableViewCell.swift

@@ -146,9 +146,7 @@ class TimelineStatusTableViewCell: BaseStatusTableViewCell {
             verticalStackToActionsContainerConstraint.isActive = false
         } else {
             actionsContainerView.isHidden = false
-            // sometimes this constraint is nil for reasons i can't discern
+            actionsContainerHeightConstraint.isActive = true
-            // not re-activating in that case doesn't seem to make a difference
-            actionsContainerHeightConstraint?.isActive = true
             verticalStackToSuperviewConstraint.isActive = false
             verticalStackToActionsContainerConstraint.isActive = true
         }