diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e5042c13..3b598426f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -69,12 +69,6 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.gultsch.chat.ui.ConversationActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -82,6 +76,17 @@
                 <data android:host="jabber" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="eu.siacs.conversations.ui.ShareWithActivity"
+            android:label="Conversations"
+            android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
+            android:icon="@drawable/ic_launcher">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 9a5cbc0cc..bc574fba0 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -928,7 +928,7 @@ public class XmppConnectionService extends Service {
 	public void deleteAccount(Account account) {
 		Log.d(LOGTAG, "called delete account");
 		if (account.getXmppConnection() != null) {
-			this.disconnect(account, false);
+			this.disconnect(account, true);
 		}
 		databaseBackend.deleteAccount(account);
 		this.accounts.remove(account);