diff --git a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m
index dcb6a9da3..828c074e8 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/AttachmentUploadView.m
@@ -6,6 +6,7 @@
 #import "OWSBezierPathView.h"
 #import "OWSProgressView.h"
 #import <SignalMessaging/UIView+OWS.h>
+#import <SignalServiceKit/AppContext.h>
 #import <SignalServiceKit/OWSUploadOperation.h>
 #import <SignalServiceKit/TSAttachmentStream.h>
 
@@ -149,7 +150,7 @@ NS_ASSUME_NONNULL_BEGIN
     const CGFloat kBubbleTailWidth = 6.f;
     CGRect bounds = self.bounds;
     bounds.size.width -= kBubbleTailWidth;
-    if (self.isRTL) {
+    if (CurrentAppContext().isRTL) {
         bounds.origin.x += kBubbleTailWidth;
     }
 
diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m
index 189b11369..5d4db54a0 100644
--- a/SignalMessaging/contacts/OWSContactsManager.m
+++ b/SignalMessaging/contacts/OWSContactsManager.m
@@ -771,11 +771,10 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
     if (profileName.length > 0) {
         NSAttributedString *result =
             [[NSAttributedString alloc] initWithString:recipientId attributes:primaryAttributes];
-        result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@" "] referenceView:[UIView new]];
-        result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@"~"] referenceView:[UIView new]];
-        result =
-            [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:profileName attributes:secondaryAttributes]
-                    referenceView:[UIView new]];
+        result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@" "]];
+        result = [result rtlSafeAppend:[[NSAttributedString alloc] initWithString:@"~"]];
+        result = [result
+            rtlSafeAppend:[[NSAttributedString alloc] initWithString:profileName attributes:secondaryAttributes]];
         return [result copy];
     }