diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 9c2967be5..ae1c747e1 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -603,18 +603,22 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleForwarding() {
     DcChat dcChat = dcContext.getChat(chatId);
-    String name = dcChat.getName();
-    if( !dcChat.isGroup() ) {
-      int[] contactIds = dcContext.getChatContacts(chatId);
-      if( contactIds.length==1 || contactIds.length==2 ) {
-        name = dcContext.getContact(contactIds[0]).getNameNAddr();
+    if (dcChat.isSelfTalk()) {
+      new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    } else {
+      String name = dcChat.getName();
+      if (!dcChat.isGroup()) {
+        int[] contactIds = dcContext.getChatContacts(chatId);
+        if (contactIds.length == 1 || contactIds.length == 2) {
+          name = dcContext.getContact(contactIds[0]).getNameNAddr();
+        }
       }
+      new AlertDialog.Builder(this)
+              .setMessage(getString(R.string.ask_forward, name))
+              .setPositiveButton(R.string.ok, (dialogInterface, i) -> new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR))
+              .setNegativeButton(R.string.cancel, (dialogInterface, i) -> finish())
+              .show();
     }
-    new AlertDialog.Builder(this)
-            .setMessage(getString(R.string.ask_forward, name))
-            .setPositiveButton(R.string.ok, (dialogInterface, i) -> new RelayingTask(this, chatId).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR))
-            .setNegativeButton(R.string.cancel, (dialogInterface, i) -> finish())
-            .show();
   }
 
   private void handleSharing() {