diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index 04b3e3bbe..22e966178 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -229,7 +229,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     Intent intent = new Intent(this, ConversationActivity.class);
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, (long)chatId);
     intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
-    intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(dcContext.getChat((int)chatId)));
+    intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(chatId));
     startActivity(intent);
     finish();
   }
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index 07a10d803..8e395e9fd 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -91,10 +91,9 @@ public class NewConversationActivity extends ContactSelectionActivity {
 
   private void openConversation(int chatId) {
     final DcContext dcContext = DcHelper.getContext(this);
-    DcChat dcChat = dcContext.getChat(chatId);
 
     Intent intent = new Intent(this, ConversationActivity.class);
-    intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(dcChat));
+    intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(chatId));
     intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA));
     intent.setDataAndType(getIntent().getData(), getIntent().getType());
 
diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
index 293c90b0d..c084ebf86 100644
--- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
+++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
@@ -102,13 +102,13 @@ public class ApplicationDcContext extends DcContext {
     @NonNull
     public Recipient getRecipient(DcChat chat) {
         RecipientProvider.RecipientDetails recipientDetails = new RecipientProvider.RecipientDetails(chat.getName(), null, false, null, null);
-        return new Recipient(Address.fromChat(chat), recipientDetails);
+        return new Recipient(Address.fromChat(chat.getId()), recipientDetails);
     }
     @NonNull
 
     public Recipient getRecipient(DcContact contact) {
         RecipientProvider.RecipientDetails recipientDetails = new RecipientProvider.RecipientDetails(contact.getDisplayName(), null, false, null, null);
-        return new Recipient(Address.fromContact(contact), recipientDetails);
+        return new Recipient(Address.fromContact(contact.getId()), recipientDetails);
     }
 
     @NonNull
diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java
index cfef0e8b4..6edabade2 100644
--- a/src/org/thoughtcrime/securesms/database/Address.java
+++ b/src/org/thoughtcrime/securesms/database/Address.java
@@ -53,12 +53,12 @@ public class Address implements Parcelable, Comparable<Address> {
 
   private final String address;
 
-  public static Address fromChat(DcChat chat) {
-    return new Address("dc:" + chat.getId());
+  public static Address fromChat(int chatId) {
+    return new Address("dc:" + chatId);
   }
 
-  public static Address fromContact(DcContact contact) {
-    return new Address("dcc:" + contact.getId());
+  public static Address fromContact(int contactId) {
+    return new Address("dcc:" + contactId);
   }
 
   private Address(@NonNull String address) {