diff --git a/res/menu/new_conversation_activity.xml b/res/menu/new_conversation_activity.xml
index 78dbfde0c..188a701e0 100644
--- a/res/menu/new_conversation_activity.xml
+++ b/res/menu/new_conversation_activity.xml
@@ -2,10 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/new_conversation_activity__refresh"
-          android:id="@+id/menu_refresh"
-          app:showAsAction="never" />
-
     <item android:title="@string/text_secure_normal__menu_new_group"
         android:id="@+id/menu_new_group" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ce23be525..dcc282d61 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1414,10 +1414,12 @@
 
     <!-- Generic and reusable strings -->
     <string name="email_address">Email address</string>
+    <string name="bad_email_address">Bad email address.</string>
     <string name="password">Password</string>
     <string name="advanced">Advanced</string>
     <string name="icon">icon</string>
     <string name="loading">Loading …</string>
     <string name="one_moment">One moment …</string>
+    <string name="new_conversation_activity__ask_start_chat_with">Chat with %1$s?</string>
 
 </resources>
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index f4118d26a..da2331523 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -16,13 +16,21 @@
  */
 package org.thoughtcrime.securesms;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
+import com.b44t.messenger.DcChat;
+import com.b44t.messenger.DcContact;
+import com.b44t.messenger.DcContext;
+
+import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
@@ -47,17 +55,43 @@ public class NewConversationActivity extends ContactSelectionActivity {
   }
 
   @Override
-  public void onContactSelected(String number) {
-    Recipient recipient = Recipient.from(this, Address.fromExternal(this, number), true);
+  public void onContactSelected(String addr) {
+    final DcContext dcContext = DcHelper.getContext(this);
+    final int contactId = dcContext.createContact(null, addr);
+    if (contactId == 0) {
+      Toast.makeText(this, R.string.bad_email_address, Toast.LENGTH_LONG).show();
+      return;
+    }
+    DcContact dcContact = dcContext.getContact(contactId);
+
+    int chatId = dcContext.getChatIdByContactId(contactId);
+    if (chatId == 0) {
+      new AlertDialog.Builder(this)
+              .setMessage(getString(R.string.new_conversation_activity__ask_start_chat_with, dcContact.getNameNAddr()))
+              .setCancelable(true)
+              .setNegativeButton(android.R.string.cancel, null)
+              .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                  openConversation(dcContext.createChatByContactId(contactId));
+                }
+              }).show();
+    }
+    else {
+      openConversation(chatId);
+    }
+  }
+
+  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, recipient.getAddress());
+    intent.putExtra(ConversationActivity.ADDRESS_EXTRA, Address.fromChat(dcChat));
     intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA));
     intent.setDataAndType(getIntent().getData(), getIntent().getType());
 
-    long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
-
-    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, (long)chatId);
     intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
     startActivity(intent);
     finish();
@@ -69,7 +103,7 @@ public class NewConversationActivity extends ContactSelectionActivity {
 
     switch (item.getItemId()) {
     case android.R.id.home:   super.onBackPressed(); return true;
-    case R.id.menu_refresh:   handleManualRefresh(); return true;
+    //case R.id.menu_refresh:   handleManualRefresh(); return true; -- seems unneeded for delta
     case R.id.menu_new_group: handleCreateGroup();   return true;
     case R.id.menu_invite:    handleInvite();        return true;
     }
@@ -77,10 +111,12 @@ public class NewConversationActivity extends ContactSelectionActivity {
     return false;
   }
 
+  /* seems unneeded for delta
   private void handleManualRefresh() {
     contactsFragment.setRefreshing(true);
     onRefresh();
   }
+  */
 
   private void handleCreateGroup() {
     startActivity(new Intent(this, GroupCreateActivity.class));