diff --git a/Signal/src/ViewControllers/SendExternalFileViewController.m b/Signal/src/ViewControllers/SendExternalFileViewController.m
index 1c46aee18..501f83ace 100644
--- a/Signal/src/ViewControllers/SendExternalFileViewController.m
+++ b/Signal/src/ViewControllers/SendExternalFileViewController.m
@@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
         = ScaleFromIPhone5To7Plus(40, 50);
     const CGFloat imageLabelSpacing = ScaleFromIPhone5To7Plus(5, 8);
     const CGFloat titleVSpacing = ScaleFromIPhone5To7Plus(10, 15);
-    const CGFloat contentVMargin = ScaleFromIPhone5To7Plus(20, 20);
+    const CGFloat contentVMargin = 20;
 
     UIView *header = [UIView new];
     header.backgroundColor = [UIColor whiteColor];
@@ -139,7 +139,6 @@ NS_ASSUME_NONNULL_BEGIN
     label.text = [self formattedFileName];
     label.textColor = [UIColor ows_materialBlueColor];
     label.font = [UIFont ows_regularFontWithSize:ScaleFromIPhone5To7Plus(16.f, 20.f)];
-    label.lineBreakMode = NSLineBreakByTruncatingMiddle;
     return label;
 }
 
diff --git a/Signal/src/ViewControllers/ThreadViewHelper.h b/Signal/src/ViewControllers/ThreadViewHelper.h
index 5d88fce1a..d6d98b638 100644
--- a/Signal/src/ViewControllers/ThreadViewHelper.h
+++ b/Signal/src/ViewControllers/ThreadViewHelper.h
@@ -2,6 +2,8 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //
 
+NS_ASSUME_NONNULL_BEGIN
+
 @protocol ThreadViewHelperDelegate <NSObject>
 
 - (void)threadListDidChange;
@@ -24,3 +26,5 @@
 @property (nonatomic, readonly) NSMutableArray<TSThread *> *threads;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Signal/src/ViewControllers/ThreadViewHelper.m b/Signal/src/ViewControllers/ThreadViewHelper.m
index cfb12b421..b8c37fbce 100644
--- a/Signal/src/ViewControllers/ThreadViewHelper.m
+++ b/Signal/src/ViewControllers/ThreadViewHelper.m
@@ -10,6 +10,8 @@
 #import <YapDatabase/YapDatabaseViewChange.h>
 #import <YapDatabase/YapDatabaseViewConnection.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ThreadViewHelper ()
 
 @property (nonatomic) YapDatabaseConnection *uiDatabaseConnection;
@@ -134,3 +136,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/Signal/src/views/ContactTableViewCell.m b/Signal/src/views/ContactTableViewCell.m
index 82fd906ee..12286a83d 100644
--- a/Signal/src/views/ContactTableViewCell.m
+++ b/Signal/src/views/ContactTableViewCell.m
@@ -53,10 +53,10 @@ NSString *const kContactsTable_CellReuseIdentifier = @"kContactsTable_CellReuseI
     const CGFloat kAvatarSize = 40.f;
     _avatarView = [UIImageView new];
     _avatarView.image = [UIImage imageNamed:@"empty-group-avatar"];
+    _avatarView.contentMode = UIViewContentModeScaleToFill;
     // applyRoundedBorderToImageView requires the avatar to have
     // the correct size.
     _avatarView.frame = CGRectMake(0, 0, kAvatarSize, kAvatarSize);
-    _avatarView.contentMode = UIViewContentModeScaleToFill;
     _avatarView.layer.minificationFilter = kCAFilterTrilinear;
     _avatarView.layer.magnificationFilter = kCAFilterTrilinear;
     [self.contentView addSubview:_avatarView];