diff --git a/SignalMessaging/Views/ContactCellView.h b/SignalMessaging/Views/ContactCellView.h
index 72797009f..93c1b4675 100644
--- a/SignalMessaging/Views/ContactCellView.h
+++ b/SignalMessaging/Views/ContactCellView.h
@@ -11,7 +11,7 @@ extern const CGFloat kContactCellAvatarTextMargin;
 @class SignalAccount;
 @class TSThread;
 
-@interface ContactCellView : UIView
+@interface ContactCellView : UIStackView
 
 @property (nonatomic, nullable) NSString *accessoryMessage;
 
diff --git a/SignalMessaging/Views/ContactCellView.m b/SignalMessaging/Views/ContactCellView.m
index a0c756657..e353063e1 100644
--- a/SignalMessaging/Views/ContactCellView.m
+++ b/SignalMessaging/Views/ContactCellView.m
@@ -84,22 +84,12 @@ const CGFloat kContactCellAvatarTextMargin = 12;
     [self.nameContainerView setContentHuggingHorizontalLow];
     [self.accessoryViewContainer setContentHuggingHorizontalHigh];
 
-    UIStackView *hStackView = [[UIStackView alloc] initWithArrangedSubviews:@[
-        self.avatarView,
-        self.nameContainerView,
-        self.accessoryViewContainer,
-    ]];
-    hStackView.axis = UILayoutConstraintAxisHorizontal;
-    hStackView.spacing = kContactCellAvatarTextMargin;
-    hStackView.distribution = UIStackViewDistributionFill;
-    [self addSubview:hStackView];
-    [hStackView autoVCenterInSuperview];
-    [hStackView autoPinEdgeToSuperviewMargin:ALEdgeLeading];
-    [hStackView autoPinEdgeToSuperviewMargin:ALEdgeTrailing];
-
-    // Ensure that the cell's contents never overflow the cell bounds.
-    [hStackView autoPinEdgeToSuperviewMargin:ALEdgeTop relation:NSLayoutRelationGreaterThanOrEqual];
-    [hStackView autoPinEdgeToSuperviewMargin:ALEdgeBottom relation:NSLayoutRelationGreaterThanOrEqual];
+    self.axis = UILayoutConstraintAxisHorizontal;
+    self.spacing = kContactCellAvatarTextMargin;
+    self.alignment = UIStackViewAlignmentCenter;
+    [self addArrangedSubview:self.avatarView];
+    [self addArrangedSubview:self.nameContainerView];
+    [self addArrangedSubview:self.accessoryViewContainer];
 
     [self configureFonts];
 }