diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 050ba0753a..bf438630dd 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2150,7 +2150,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
       // Loki - Always send friend requests if we're not friends with the user
       int friendRequestStatus = DatabaseFactory.getThreadDatabase(context).getFriendRequestStatus(threadId);
-      message.setIsFriendRequest(friendRequestStatus != ThreadDatabase.LokiFriendRequestStatus.FRIENDS);
+      message.isFriendRequest = (friendRequestStatus != ThreadDatabase.LokiFriendRequestStatus.FRIENDS);
     }
 
     Permissions.with(this)
diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
index 7c54a04bf6..c5d3aca7c7 100644
--- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -643,7 +643,7 @@ public class SmsDatabase extends MessagingDatabase {
     contentValues.put(EXPIRES_IN, message.getExpiresIn());
     contentValues.put(DELIVERY_RECEIPT_COUNT, Stream.of(earlyDeliveryReceipts.values()).mapToLong(Long::longValue).sum());
     contentValues.put(READ_RECEIPT_COUNT, Stream.of(earlyReadReceipts.values()).mapToLong(Long::longValue).sum());
-    contentValues.put(IS_FRIEND_REQUEST, message.isFriendRequest() ? 1 : 0);
+    contentValues.put(IS_FRIEND_REQUEST, message.isFriendRequest ? 1 : 0);
 
     SQLiteDatabase db        = databaseHelper.getWritableDatabase();
     long           messageId = db.insert(TABLE_NAME, ADDRESS, contentValues);
diff --git a/src/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java b/src/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
index f484f076db..5c3de47b5a 100644
--- a/src/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/OutgoingTextMessage.java
@@ -9,7 +9,7 @@ public class OutgoingTextMessage {
   private final String    message;
   private final int       subscriptionId;
   private final long      expiresIn;
-  boolean                 isFriendRequest = false;
+  public boolean          isFriendRequest = false;
 
   public OutgoingTextMessage(Recipient recipient, String message, int subscriptionId) {
     this(recipient, message, 0, subscriptionId);