From 0185096240eb5c5bbcb14d1746e3e3dffc418ff5 Mon Sep 17 00:00:00 2001
From: Bastien Le Querrec <bastien@silence.im>
Date: Wed, 4 Jan 2017 16:52:34 +0100
Subject: [PATCH] add XMPP support, increase SDK target

---
 .travis.yml                                   |   1 +
 AndroidManifest.xml                           |  42 ++
 build.gradle                                  |  16 +-
 proguard.cfg                                  |   6 +
 res/drawable-hdpi/ic_xmpp_black.png           | Bin 0 -> 644 bytes
 res/drawable-hdpi/ic_xmpp_grey.png            | Bin 0 -> 790 bytes
 res/drawable-hdpi/ic_xmpp_white_18dp.png      | Bin 0 -> 325 bytes
 res/drawable-mdpi/ic_xmpp_black.png           | Bin 0 -> 433 bytes
 res/drawable-mdpi/ic_xmpp_grey.png            | Bin 0 -> 485 bytes
 res/drawable-mdpi/ic_xmpp_white_18dp.png      | Bin 0 -> 281 bytes
 res/drawable-xhdpi/ic_xmpp_black.png          | Bin 0 -> 911 bytes
 res/drawable-xhdpi/ic_xmpp_grey.png           | Bin 0 -> 1172 bytes
 res/drawable-xhdpi/ic_xmpp_white_18dp.png     | Bin 0 -> 430 bytes
 res/drawable-xxhdpi/ic_xmpp_black.png         | Bin 0 -> 1306 bytes
 res/drawable-xxhdpi/ic_xmpp_grey.png          | Bin 0 -> 1692 bytes
 res/drawable-xxhdpi/ic_xmpp_white_18dp.png    | Bin 0 -> 646 bytes
 res/drawable-xxhdpi/splash_xmpp.png           | Bin 0 -> 16932 bytes
 res/drawable-xxxhdpi/ic_xmpp_black.png        | Bin 0 -> 2239 bytes
 res/drawable-xxxhdpi/ic_xmpp_grey.png         | Bin 0 -> 2990 bytes
 res/layout/color_fragment.xml                 |   3 +-
 res/layout/conversation_item_received.xml     |  13 +
 res/layout/conversation_item_sent.xml         |  12 +
 res/layout/register_custom_xmpp_server.xml    |  76 ++
 res/layout/register_xmpp_account.xml          |  68 ++
 res/layout/xmpp_address_dialog.xml            |  24 +
 res/layout/xmpp_enter_address_dialog.xml      |  22 +
 res/menu/conversation_secure_xmpp.xml         |   9 +
 res/values-v11/styles.xml                     |   4 +-
 res/values/attrs.xml                          |   2 +
 res/values/colors.xml                         |   2 +
 res/values/strings.xml                        |  74 +-
 res/values/themes.xml                         |   4 +
 res/xml/preferences.xml                       |   4 +
 res/xml/preferences_xmpp.xml                  |  28 +
 res/xml/provider_paths.xml                    |   4 +
 .../smssecure/ApplicationContext.java         |   8 +
 .../ApplicationPreferencesActivity.java       |  31 +-
 .../smssecure/BasicIntroFragment.java         |  70 +-
 .../smssecure/ConversationActivity.java       | 150 +++-
 .../smssecure/smssecure/ConversationItem.java |  69 +-
 .../smssecure/ConversationListFragment.java   |  28 +-
 .../smssecure/IntroScreenActivity.java        |  24 +-
 .../smssecure/MessageDetailsActivity.java     |   4 +-
 .../smssecure/smssecure/ShareActivity.java    |  17 +-
 .../smssecure/smssecure/TransportOption.java  |   4 +-
 .../smssecure/smssecure/TransportOptions.java |  15 +
 .../smssecure/XmppAddressDialog.java          |  86 +++
 .../smssecure/XmppEnterAddressDialog.java     |  63 ++
 .../smssecure/XmppRegisterActivity.java       | 171 +++++
 .../smssecure/XmppRegisterCustomActivity.java | 145 ++++
 .../components/reminder/Reminder.java         |   7 +-
 .../components/reminder/ReminderView.java     |   7 +-
 .../XmppConnectivityDisconnectedReminder.java |  29 +
 .../smssecure/smssecure/crypto/SmsCipher.java |  22 +-
 .../database/CanonicalAddressDatabase.java    |  50 +-
 .../smssecure/database/DatabaseFactory.java   |  23 +-
 .../database/EncryptingSmsDatabase.java       |   5 +-
 .../smssecure/database/MmsDatabase.java       |  29 +-
 .../smssecure/database/MmsSmsColumns.java     |  15 +-
 .../database/RecipientPreferenceDatabase.java |  23 +-
 .../smssecure/database/SmsDatabase.java       |  44 +-
 .../database/model/MessageRecord.java         |  12 +-
 .../database/model/SmsMessageRecord.java      |   2 +-
 .../database/model/ThreadRecord.java          |   2 +-
 .../smssecure/smssecure/jobs/MmsSendJob.java  |  43 +-
 .../smssecure/jobs/SmsDecryptJob.java         |  29 +-
 .../smssecure/jobs/SmsReceiveJob.java         |  29 +-
 .../smssecure/smssecure/jobs/SmsSendJob.java  |  76 +-
 .../smssecure/mms/MmsSendResult.java          |   6 +-
 .../smssecure/mms/OutgoingMediaMessage.java   |   4 +
 .../mms/OutgoingXmppMediaMessage.java         |  33 +
 .../notifications/WearReplyReceiver.java      |   2 +-
 .../preferences/ChatsPreferenceFragment.java  |   1 -
 .../preferences/XmppPreferenceFragment.java   | 207 ++++++
 .../providers/PersistentBlobProvider.java     |   6 +-
 .../smssecure/recipients/Recipient.java       |  20 +-
 .../recipients/RecipientFactory.java          | 122 +++-
 .../recipients/RecipientProvider.java         |  19 +-
 .../smssecure/recipients/Recipients.java      |  13 +
 .../smssecure/service/KeyCachingService.java  |  18 +-
 .../service/QuickResponseService.java         |   6 +-
 .../smssecure/service/XmppHttpUpload.java     | 113 +++
 .../smssecure/service/XmppService.java        | 683 ++++++++++++++++++
 .../smssecure/service/XmppServiceBoot.java    |  28 +
 .../smssecure/sms/IncomingTextMessage.java    |  28 +-
 .../smssecure/sms/MessageSender.java          |  24 +-
 .../sms/MultipartSmsMessageHandler.java       |   4 +-
 .../sms/MultipartSmsTransportMessage.java     |   7 +-
 .../smssecure/sms/OutgoingTextMessage.java    |   6 +
 .../sms/OutgoingXmppExchangeMessage.java      |  28 +
 .../smssecure/smssecure/util/ServiceUtil.java |  10 +
 .../smssecure/util/SilencePreferences.java    |  70 ++
 .../util/XmppCharacterCalculator.java         |   9 +
 .../smssecure/smssecure/util/XmppUtil.java    | 240 ++++++
 94 files changed, 3138 insertions(+), 315 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_xmpp_black.png
 create mode 100644 res/drawable-hdpi/ic_xmpp_grey.png
 create mode 100644 res/drawable-hdpi/ic_xmpp_white_18dp.png
 create mode 100644 res/drawable-mdpi/ic_xmpp_black.png
 create mode 100644 res/drawable-mdpi/ic_xmpp_grey.png
 create mode 100644 res/drawable-mdpi/ic_xmpp_white_18dp.png
 create mode 100644 res/drawable-xhdpi/ic_xmpp_black.png
 create mode 100644 res/drawable-xhdpi/ic_xmpp_grey.png
 create mode 100644 res/drawable-xhdpi/ic_xmpp_white_18dp.png
 create mode 100644 res/drawable-xxhdpi/ic_xmpp_black.png
 create mode 100644 res/drawable-xxhdpi/ic_xmpp_grey.png
 create mode 100644 res/drawable-xxhdpi/ic_xmpp_white_18dp.png
 create mode 100644 res/drawable-xxhdpi/splash_xmpp.png
 create mode 100644 res/drawable-xxxhdpi/ic_xmpp_black.png
 create mode 100644 res/drawable-xxxhdpi/ic_xmpp_grey.png
 create mode 100644 res/layout/register_custom_xmpp_server.xml
 create mode 100644 res/layout/register_xmpp_account.xml
 create mode 100644 res/layout/xmpp_address_dialog.xml
 create mode 100644 res/layout/xmpp_enter_address_dialog.xml
 create mode 100644 res/menu/conversation_secure_xmpp.xml
 create mode 100644 res/xml/preferences_xmpp.xml
 create mode 100644 res/xml/provider_paths.xml
 create mode 100644 src/org/smssecure/smssecure/XmppAddressDialog.java
 create mode 100644 src/org/smssecure/smssecure/XmppEnterAddressDialog.java
 create mode 100644 src/org/smssecure/smssecure/XmppRegisterActivity.java
 create mode 100644 src/org/smssecure/smssecure/XmppRegisterCustomActivity.java
 create mode 100644 src/org/smssecure/smssecure/components/reminder/XmppConnectivityDisconnectedReminder.java
 create mode 100644 src/org/smssecure/smssecure/mms/OutgoingXmppMediaMessage.java
 create mode 100644 src/org/smssecure/smssecure/preferences/XmppPreferenceFragment.java
 create mode 100644 src/org/smssecure/smssecure/service/XmppHttpUpload.java
 create mode 100644 src/org/smssecure/smssecure/service/XmppService.java
 create mode 100644 src/org/smssecure/smssecure/service/XmppServiceBoot.java
 create mode 100644 src/org/smssecure/smssecure/sms/OutgoingXmppExchangeMessage.java
 create mode 100644 src/org/smssecure/smssecure/util/XmppCharacterCalculator.java
 create mode 100644 src/org/smssecure/smssecure/util/XmppUtil.java

diff --git a/.travis.yml b/.travis.yml
index 96ab6bdb8..22f96677d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ android:
     - build-tools-20.0.0
     - build-tools-19.1.0
     - android-22
+    - android-25
     - extra-android-m2repository
 
 before_script:
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a702cf216..d77750d33 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,6 +22,7 @@
     <uses-permission android:name="android.permission.WRITE_PROFILE"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.RECEIVE_SMS"/>
     <uses-permission android:name="android.permission.RECEIVE_MMS"/>
     <uses-permission android:name="android.permission.READ_SMS"/>
@@ -76,6 +77,21 @@
             <data android:mimeType="video/*" />
         </intent-filter>
 
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:host="s.silence.im"
+                  android:scheme="https" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <category android:name="android.intent.category.DEFAULT" />
+        </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:host="s.silence.im"
+                  android:scheme="http" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <category android:name="android.intent.category.DEFAULT" />
+        </intent-filter>
+
     </activity>
 
     <activity android:name=".ConversationListActivity"
@@ -237,6 +253,16 @@
               android:theme="@style/Silence.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".XmppRegisterActivity"
+              android:label="@string/AndroidManifest__register"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".XmppRegisterCustomActivity"
+              android:label="@string/AndroidManifest__use_a_custom_xmpp_server"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <!-- this can never have launchMode singleTask or singleInstance! -->
     <activity android:name=".PanicResponderActivity"
               android:noHistory="true"
@@ -266,6 +292,14 @@
         </intent-filter>
     </service>
 
+    <service android:enabled="true" android:name=".service.XmppService"/>
+
+    <receiver android:name=".service.XmppServiceBoot">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
     <receiver android:name=".service.SmsListener"
               android:permission="android.permission.BROADCAST_SMS"
               android:enabled="true"
@@ -315,6 +349,14 @@
         </intent-filter>
     </receiver>
 
+    <provider android:name="android.support.v4.content.FileProvider"
+              android:grantUriPermissions="true"
+              android:exported="false"
+              android:authorities="org.smssecure.provider.smssecure" >
+              <meta-data android:name="android.support.FILE_PROVIDER_PATHS"
+                         android:resource="@xml/provider_paths"/>
+    </provider>
+
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"
diff --git a/build.gradle b/build.gradle
index d641a79cc..f95c42c52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath files('libs/gradle-witness.jar')
     }
 }
@@ -56,6 +56,11 @@ dependencies {
     compile project (':libs:com.amulyakhare.textdrawable:library')
     compile 'me.relex:circleindicator:1.0.0@aar'
 
+    compile "org.igniterealtime.smack:smack-android-extensions:4.1.9"
+    compile "org.igniterealtime.smack:smack-experimental:4.1.9"
+    compile "org.igniterealtime.smack:smack-tcp:4.1.9"
+    compile "com.squareup.okhttp3:okhttp:3.5.0"
+
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1'
     testCompile 'org.mockito:mockito-core:1.9.5'
@@ -102,7 +107,6 @@ dependencyVerification {
             'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
             'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
             'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
-            'com.squareup.okio:okio:5e1098bd3fdee4c3347f5ab815b40ba851e4ab1b348c5e49a5b0362f0ce6e978',
             'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
             'org.whispersystems:axolotl-android:40d3db5004a84749a73f68d2f0d01b2ae35a73c54df96d8c6c6723b96efb6fc0',
@@ -113,19 +117,23 @@ dependencyVerification {
             'org.whispersystems:textsecure-java:b407ca6d1430204dfabf38e27db22d5177409072a9668238bd1877de7676ad3f',
             'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
             'com.squareup.okhttp:okhttp:89b7f63e2e5b6c410266abc14f50fe52ea8d2d8a57260829e499b1cd9f0e61af',
+            'org.igniterealtime.smack:smack-android-extensions:622837f2afeb21c364e42685985f46d52c4b3746ea4108390face7b08303f209',
+            'org.igniterealtime.smack:smack-experimental:3b01f815b03e35f55149ab0f08432b69944e50582b2d277d9f3229729f440ed2',
+            'org.igniterealtime.smack:smack-tcp:69343b52816522aa491b743a0e620b06feb7245a174c7d0cce669586fa3995b3',
     ]
 }
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 25
     buildToolsVersion '22.0.1'
+    useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         versionCode 128
         versionName "0.14.8"
 
         minSdkVersion 9
-        targetSdkVersion 22
+        targetSdkVersion 25
 
         try{
             buildConfigField "String", "BUILD_GIT_COMMIT", "\"" + 'git rev-parse --short HEAD'.execute().text.trim() + "\""
diff --git a/proguard.cfg b/proguard.cfg
index 5d5e5b27a..9adb79a40 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -112,3 +112,9 @@
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
+
+-keep class org.apache.http.** { *; }
+-dontwarn uk.co.senab.photoview.**
+
+-keep class org.jivesoftware.smack.** { *; }
+-keep class org.jivesoftware.smackx.** { *; }
diff --git a/res/drawable-hdpi/ic_xmpp_black.png b/res/drawable-hdpi/ic_xmpp_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..0367e762bdd64d37a97fad7fc8f9b3249c137324
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0MG!?
z0ML8vBf<ax010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|mA5;@+2tDyh@0uf0>
zK~!i3?O0n*1tAO_pV4iZ=&m%Q+cGZ8XnaID$@HevTWBlb%m+<wfIdzS1qO1bX~?L+
zsKBVes6c}X%n9SC0nUFwym79lOUCb|#U${1TE=^6t`=V4hQ2C9UbYvicYozsN+G$>
z_(e-k#!}mRGQ84Z9;E=y)@qxfni_sdr!7Dj1PNvpDW)tD&Djna=nzA3dC=~=^U3L*
z@ImTh#t{Kn?Zl%wSDg6@fH-|ly_4vDs7)Sn0_SGLwhj+6{c1TDW7U$%1jZOE_+j{P
z^ATUU0&qTZ;s}lVuK~QrfbaB`oO7QrsaJ1BXEKRZ8mo|{Y6HwGC7cq5HwVt9`hn55
z5GA~(PNx>HO0THo5o}e?TcN+)2VU$V$I=RTCP)>G-Ul}nXtYK0M(oOrYFWR?VYaYf
zzg;n?9F*SXoQx+8i18S$@4g!%ON6(&b?`iA0fa4a^RmtWPxPJ!cU+<Lt+Rmp#S%Ap
z3n*vzYymA6lhd{f*J*KGbQT$H4|AfjulaW&E<q&`KE_IsaJ}qvKk|3CE%qA-<plVa
zJs0cJM-Fig5G0>7#;)WuIjhuiduU_tEnG#UCU{Q48u8L<)Z}X#YyC0hxd)mOihyZV
zM?5}}(uU9QZbXv1&oG;lUi#vVwTaMQ+(an*k8y^bjE}rzGmzV=JrBig8IJ6u0;2+>
e0;2-EtiUg_7!+JpDX16#0000<MNUMnLSTZBkr)a9

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_xmpp_grey.png b/res/drawable-hdpi/ic_xmpp_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..59b598294f8697c2199f5d9c705a6037e95e990e
GIT binary patch
literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|mA5+%xm_wE1y0;5Sp
zK~!i3?O1J210fK#ex=@~XRy&jnON6&D~+C^moXZ((f2A#SULm4E^Yb)k_HxrH}4G$
zyY%Fwl@@^(ffj)lfvFK#uh$)Zzf*AzF&{iXLayh|>4tSM@U&PgR)-*D@c~|Q*nLR0
zGj_s&m9_$x5c5rgLl$s4gTEie=NmXJIkpwRMi6~IYGtotQjv}bc^;(#LYykw45VKH
zdL07i+K9gAeVQ{)jNij~ml(GW6_JlYLjjlZ;E_HL^3e+znW%S%773n%Kzjj>$o4ob
zAazk-yBE`e0I2KV3wv=^0d(ixG!Rh1K@kKFfua>efS+OqI|5+jkEqyq56|xfn2(a}
zjsRz5&INalOW2k^^9mraodhTfD9nXx3Al2fnwz2k=lrTNi2)o|PW(6<7`X=oRNWD(
z08ILnz@$Eq`I7oGef+}A7Vt>sq$+^OxygZd^Iqm02)1s!Bza;b1<=4MqA;2H0hcSc
z@SU^C3vdW(5(OSiQH9W(V2;-O2Kg6lFznB+0F430B+4eWF&Cag0#Y0P2H!i9P2Xn{
zKx2S1sc-v<N}bFF2-I#^9u9u8``#O)VHUti0OztMMS!GuHAO$g@tUZXQt|{U62J*g
zL~@Cht&}=yx#x=_PcAH@CjC#%-lKVnY!gvi6^G;PdfbwFk^nl&kR!ghr5wo_M7rj<
zYO(;jg$SN3mgCX09J^&afNN9{(1T`Hqc>ZE{9FGpwXQ0FWFVqL^}u#qYDGQ7tttTI
z)xQ9p(+xye-s&O8WV@OGY5OqZ=;!enzu^2oYe{y7!N~#y;wuo}xx2!y1D|+nox@iB
z);I7U_Z|QlUPi+2`7019xj)47{hzfK(nn{5fXrP`j*eR+)FRL#&?3+xaNH621D5H)
UiD1-Or~m)}07*qoM6N<$f<>HCS^xk5

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_xmpp_white_18dp.png b/res/drawable-hdpi/ic_xmpp_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8aeac9d6b2ef1051411e8a9f3234a462b9a5ad4
GIT binary patch
literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^;y^6O!3HGFip}=|DYhhUcNZWH1V5d3*8?fe0*}aI
zppNSx%;=;sy8<Z4UgGKN%Km_rPl$^#;pwwvppayVYeb22er|4RUI~M9QEFmIYKlU6
zW=V#EyQgnJcq1RkuC<;njv*F;TPIxPJz~J&?4AB9Y5ViHQ?5;25yLb`^yMd4o!>K4
zq?2p5+shQ_9y<Fb;_a-6z=RD!SDu!$9%y~V^KRX&@EYAc)tiFK4u|hwrd57#^G@zl
zZgbl$`S);z+zzd~7GIE;8f=!n)bM{3vk>nEBY_gT$h;=y36hc`r?vJMYMhf)xtw(F
zz3v@fL5{t*t{HD{*S~v)l}lpHm-9QHG}Xzx3AhuRyxvB;A%32)qjuaHM$JjDfevTz
MboFyt=akR{0Q|&t&j0`b

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_xmpp_black.png b/res/drawable-mdpi/ic_xmpp_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..460946ac13280ab08709ea4007af5a98e9e8a7f1
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7lsQUSp7!%5Kx4(z$3Dl
zfq`2Xgc%uT&5-~KvX^-Jy0SlD<rNo^)4jCQhk=37&eO#)B!cs8m^UAjB9Clu=e@&A
zrx(1O_*LPZO~<+^=0QPTr_<*c9=njjlpB9vyH%onVf6e1{XP#~{yMPzuao_f(g#r@
zPqfe1@3OaMI@kL*L;99RHp9+4UMHtJ?YVbkU2R&r(!EYCqhp1szhCLP6vdlPWWL88
zbE4l(Siyd~TfZ86$<9m3e8SVqqouYUiLMR#yv65$P<F3-`vhK>lVNH7`n~pxrt&IO
zb_r}O?vB06&F^zkjopW7pGJ9m81Ku-tyy!;7zI`)tlyxnn!5FfK35sf(-wve9BX%l
z{Ymg`klNO=r8-Zn-D4$V!WOkB-q)q7B(^@7lVY*(k3&mZ%AbxSLT!`13}5OmoL%4*
z_~VwTN~_U=yX%i+*s(12eYC2wC8(p@c}ksSrk0R>cfY-aDO1Zs-*cB7)L#n!xX-zV
YfzdBmswCd88W^|?p00i_>zopr0G5WSE&u=k

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_xmpp_grey.png b/res/drawable-mdpi/ic_xmpp_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..24aa687b5944f4d97564f085925b3e99f731eb3b
GIT binary patch
literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|mA6bY^YJc|GT0dh%1
zK~z`??N&i@!Y~YUJDn;2=&j|DFK~h<!!L3uw>|_;W#zGqY)7)vw8Npv#j>?ptt2N9
z!uqTocyI@vDE~N)-$}=27>4U#Y7)7&$aSs-<lJyZUp`o1An6g|dr86kFY-{@LTO;I
z^!IETZ(*O4b7O(LWXu8lneE;h1)##;p8H!Tan8pb=-}f;{pf=3fY-a(S|~VoJPUBl
z`Lm^3ev$<&r}8n>g%$#8r;oBk;R2fNFVP_s0+RDkgLn_}FSd>KqWPu@Yy<#w(g<+g
zyWMK&RB{400_ac!lMh``MZm|Obb`u9EoxE#MH(VJW01*-OC75!z!HH<n>lOM8-+xX
zrT{}kanq*+A@<r!PW)W~nh35KD~TxtVZTH2{Iw$v?V0tHn<}l772KYxWxy-}9LUx4
zKCRSpSJg7kH3Au+**{56T(bqp>QlSpD@NzirwOgkT_XT7{lR#rU~9%wfQ73?toyYC
b|GNV>ff{Xd`7-}>00000NkvXXu0mjfXJgB;

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_xmpp_white_18dp.png b/res/drawable-mdpi/ic_xmpp_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d23da4d965a9fd17d19449306fe4023257704b3
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngj!3HE3xL=O}Qfx`y?k+$Y2!1;6t_M<_1s;*b
zKpodXn9)gNb_Gz7y~NYkmHh!LpAeVT#drMfKq1Kz*N775{M_8syb=cIqSVBa)D(sC
z%#sWRcTeAd@J2pyprS@k7sn6{(YX^23N|S4uyF3Z(Ww9S^rtlk+P*Y*J~n*b$^S&S
z_$F`9$|;+c%B$N1-#l|{ee9_;{;)RD18XL}zj>Z%!SY|+&uh5d`#HW%sy*GJkoCCJ
z#_xyzj-71$uktD+k4Vfs#Fcgak9VIUcf-$PvmQEY>t}SHir?$a+%1^J|B=OLlS5Bf
Tz`O52$1r%h`njxgN@xNAT90FI

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_xmpp_black.png b/res/drawable-xhdpi/ic_xmpp_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..861ec077e66b322a78e06ad81c7339eb5a2810fc
GIT binary patch
literal 911
zcmV;A191F_P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0MG!?
z0ML8vBf<ax010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|mA5IS|en3(_o0~|?2
zK~#7F?OMBX6fqDy2p};85SXHh?;tmXB+mI2C&qt5?#LN-?(c8`5sv^T5ZG2@i<0&<
ztLc$+w=PCid)k%e)vZ}cySJ;A7iYj3a0Z+KXTTY72AqM_$$!GZxrFmNbj0JOBy>;P
zUnkgru~;JbwEkU`yg!X!LZ~U8cwR&hJEeNRsI|Pt4+7{ES261E3dLyTS<%Aw8jp$C
z#W?^Y904-*r!C-q6ny?N#+wb^gGulJ-ctSq<>%qJY%wyU+ZrECXPC2#(AmQQY&?Xg
z0i{QL8RluAJsb?c-Oc1$W=;us+RfE64XxqJ(%~-V9$8Sb+k=wU*w*5jW&ncx*(1^c
zHr9eCeSBr)!F0>P_|nQ+m+6S3=tp9;d#V+^bB)-jWotO6o-cn<w{#1jPa-Dj)#?%3
z=I-EYKwGi^%gvJ-OJsjbJmP>#8Bimq7W+<3fb1VK`iNnU0QBQ=atY;|F^DcJTAW4M
zy5}1v)_0UQ@|LUN$txOU>)ev<3U8-azmVV6xDzLbi89^{fe5x}?a$c-7`CV<VJ1LJ
zAkeAJGc|A)ziM1eaB8CoB8yI<zPd^;l;@OBh5-0~p$sAwYk9FsfeB9Eq>e|O9|Xfl
zOXje|0^%4SXBH<`ozG-&mQ-fIo3o5fv6L`?V)Svl0hFd_<)SSnj;QmuX6JxZnbp;1
z!MoIn;@k{gVOu2vVA^!myh7L7VzWdA#wx_j33EQQ;LZ2^ob%Sci(o(tpyUg)xJLg+
zNqH%4uaqFB^TD1{@9k26*5c5NByJlN?ZcMkS>)EkmVPxPXg5_`g3#_3v%ZE1Nd|v)
z4=tNoLjjO2*k@SuC_n6GhBBTAgXp8=dhYZzbV7bO__-iP^<fE<(jD#7)nQZ||Lkt+
z7Jx%$L>~uvd}}bgY~mKU2q;S6(I)xFPH&OBJ!V8c-T?>D^pKthq)%QB8K+B-Eq!by
zewb7U7`wfcuy`&JS1_^prs?;1n9O?oKlolCV{u#JmcOo;;ewyzaDZUcUYr4Ez!`7`
loB?OR8E^)i0cXI*zzu~w#wUe%Gr|A>002ovPDHLkV1h)9q$~gc

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_xmpp_grey.png b/res/drawable-xhdpi/ic_xmpp_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..76d49c1e0deadadf16caaf1501b15c51c72fcb94
GIT binary patch
literal 1172
zcmV;F1Z(?=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~|mA5F0tvh{pf`1R+U8
zK~#7F?OMBT6fqQ?4Jc^<31|=jzF|A4fi#4IM@z|PpcI79pn^UW(6OW@-F^eGNJu1+
zAPp%J&PBe1$DXmTU#nfkmPWS6zW1JU{20&dHcd@cfvP}Npej%ms0vgC&bk8A>GZ={
z&;UF?>pahEl}$9Bs`~nPJpQh=Ep-vRZi7IFI1|zZ;CqzMU_|*bgjl1(vL%Io2He+O
z*oOpQn^kRAJb@VRxM5Lq;N1qc7gBt>00%I-;xOD%s#2G$5QF+JL;|iI0C_9~v#0md
z1$d4IawJLnnivxpY(Nl+U6wwGy$VPBxGqFEe4yKmxS|O0Cdju#^J5s$>^KTFl=KJ2
zRD2DvwVWyD3J1<Kf;2L}*yl3jtpEyavcd~a+M1cB0GAe=Kq@?oUq^sUYqzt;QW590
z2S00ucLY$u4s!<0<qI2Ns<6E$+dctYXMtRNV*EUcF=88x{yLZS+!7$i(?C5^^*A}o
zuX8vteOLmh4yn^kdMY#Vxaui0bC6H302yY%8yAy#x4HQA3ZMWEswN;1b3`3<izO93
z`XKM*F(`mijb0}gA^nU5;eDbF3P1rN!i~tl4Mr{J7bfQ@4q*g-@62%upd8135ZN38
z7IGg#IzMPQd|h+2wM||Dpd!8D(G{FBJq}}*;Sq5EkO1}yKu+K+b{3pSK;-TNyceZD
zMFJ>iG3zkKrp1mK6eD0zOtAn^m4J!XRm%Vckocq5rDe5zg2=%4J%v*m=Klu~i3Oa~
zy4sTT)%ws!l9&`K+%E9#h6V~%_@94_&Nmc#UoHj!oC2J9wyDv#UR?)#)9vWb_hL|b
zaFC(%K?uMRNQH<U;yY!N4qF0-2%+MMHZ%zJP><s)V=zL5wcLf0=r~Zp#iIpsA3F~E
zEARVn+jmpRlgA|W7!rtu><J?PXVXp&KT<KH*L)`+DoHbdoq-VT317MH$$LqH{3nkc
zHy<Ki?7@tEw0RZ*$QwZ2LPnQ2fox|#K>aR^=<+4{1<Lz^<8z|7XITQeLy)0r?<nj2
zP@d7uL4P_YNS^s?=pXe?V#MuKvkSo9K};gT7W%(ro1q-Ui{Z?+1WfP>^u)Yx)P3Y%
zl_XDCiYd!P1C|7vaJ~Zal3B$4qw?YcFe(Tk{o}#}#5dTkbUrr$hzLYDKz7+dD(IcT
z;YZvwHvxp3A_Fh7<Fj);FD?Lxe?h>TdQerS^?eRk=S-mW%XZq+d|Jg~0)Y5iM0;jM
zY#M8gqc3&)jjQkXgl+5z^tddNvI?Mx(0_N#)7l<L+>tPVkNfD?_tInuC-LX&lSKf4
zHvf-D)B7n%C;hDserX2LOfnN4iG61b)23V<K+O>^5{%;DqQC2%P+lZRby^ju3RDHE
m0#$*kKvkeBP!%{E3j76=vIQ{H<x~*>0000<MNUMnLSTZpy8XZa

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_xmpp_white_18dp.png b/res/drawable-xhdpi/ic_xmpp_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4588bf873e8eee233fc2c4e218a888edfec14794
GIT binary patch
literal 430
zcmeAS@N?(olHy`uVBq!ia0vp^azHG`!3HF+C+nOCQfx`y?k+$Y2!1;6t_M<_1s;*b
zKpodXn9)gNb_Gz7y~NYkmHh!LpAaXb_ld0wfI^Zbt`Q~9`MJ5Nc_j?aMX8A;sVNHO
znI#zt?w-B@;f;La3=E87o-U3d9=v;}UF1Dvz~eI8V+%K9^9Jr<1NPz%-7LW+-Jcvg
zv}2#{@_V#`%j1Ni-F@rJ^UD-l%D+G7H=N62{k%`ND97Sclk@ks6IK3~kAMC9@Mz<y
zpHj{?Q>wpeu`g-7vHwTni)O34A1+nfS1ta3c7^fjv=8^vGnct4MqKMXdvED;?!~M<
zDj8c=%-PuBt?*h+RsKtO!aR<qS+ls+_l74lc{uV~EWK(I>ovz~{mcpOYwI=}Hr<*3
znDe=q=}yChTWUqwzQWJ<2bQ<>uW>ct%{bQZyh`X;z54$wJ*JlXf(CWwpJz=w|1js4
zL{hHxmlaV9H&5e_I&b8_E6}s5H`BvOeDNuBapM`xPuq6NHHC&7Jw2w%y!sz|!_10H
U?^9k+1qLI7r>mdKI;Vst0G9}=*Z=?k

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_xmpp_black.png b/res/drawable-xxhdpi/ic_xmpp_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..fce6bb1195ed0135b382e6d34bec4545d3e085f1
GIT binary patch
literal 1306
zcmZ{k{Xf$Q0LQ<iNZWZ{SW)tDM3#j-%%RQ95>1?Ogv!#|EOcShrbKRIDNn_W7fx!%
zsaDc<?7W)C(orOed1{C;T2eXva=-QZJiT6@Kj57mcmxgBG}Z(F0F3cP;x;zwdo;Fe
zw6yrb!HwAxgGD2O-tVH$?GbN0TPeQyL;%>P_dP1Wty05{Q#}dek5V7q4BoB>)m?p~
z1^{X`7^K&+WR(vkZV3kawNc>gj!-qDjI*OU2nPWX9jmAPm$qIy`RE;-Ox8E^92P%y
zr?Z>oQTGOo!@>u(v<{nls{YUvA65GGz5qg!``~my$2a2Vre~j9feF(Co`)<E>87=D
zQ`xim1bowztO~R+H|Rl|t^Ml)<&4VDIfsj0)Kb<HAvY8Q0By<{bz`p||Gj+fuIgHK
zMlc_~li?aWnR##arqg`zdy8fnu*;_ad_bw4Tvf2Rd$p2N?D)3~DEA&|Ut+-=N0O0u
z1a)dX^)iW+Is&mp){@_^KA8p&>xP-L+C*4ZN`GtP+e1s5_Hax8<L{gjxX=_Gyy+g+
z+mfDF0Ik{CYTk2Uq3r1^AZf3X1*7|oCf559fj}jpUPTeC_IPciB-f>M{2YjRMEI?8
z&F;fL&)by{Wd4OyS(9n;n@g=hD6#r1`IA?4JP`PiMZeUC5LMNg$udn1jlnGgFUvyL
zGZ`uN1+*BBkiqKAx;OrmQ_RZqAl}69msSS1@r3xQR)$0(DWj9K3=L<_OY`DK31s6{
zBk%i7*xYp3gwrkXNnLPG>^^+4r%qh*vaQ<=lDNr)g)+gilXX+MV=0jcv42<QC%2{=
zct^;wFIr4Uo|PFvV3v6F+f~<rkTX3|Z1)$L)dnMR(-qBv#eP|r-P$eNmz-4h_^%!e
z6=iS48_FhxgZ_Ejohz~kh|WbhSJ{Q3s<pLKt!VpM?xccL;R=(@sn!_A=2o1Cx}#}U
zLpC7P4r(*EBwYSv$;>;iNRY>IC5Ll^D+uP4>TVkmneFf4kP<Jl&x^4T2zQDZNXvyD
zXWZREr)Q#-!vc5ozBnfTah+i=#6YOLtkF|;@0Wz@x6|qgS0`P>Ud*yayO1yBAnX3r
z1zFX=9DPyWAi66tNOW-P^1m6d*|Pib;yt@5gIHdc$LVxS;!<xyrPrDz?ZoZ&7UF7=
z^mPI;=V4L*DtRot#dk=YGV8(k2w|9f#nMJd94s#ON;#Nd0$m`t@--BO8MA&_wR|*}
z88P4N`fTM@L4)oeyfl&z{3K!Fwz?<jV27nes$GrA%7w4ClojK1nlo{7%1`Ig@*{C$
zoqpD&v;eL3$>xjJF?XrmI8yPWB&6AKqN4VMqW5)SkRPIJk#~jea$qt$@z+g{614Bj
zu~5BQiJhQ3GVnzU_k)F`8X@m)wC91ur^?5cQH9scjWYT+6{^Z3!8PuazR}8=6y6q)
zx$}@obhPMq$0*=tsRmC39|qGp9vWC>o`Dbk=GZabm-XknYNzmv+ro4UZKe@X4<h*N
zL3S(i6PP(H*<EimJQteXkkQw}GwEEFT9n#c4}Ir~n|kR01@)geqkWB0^d-zioHNni
z){yUsiNeS7CfE&jAEAoV>v%RsssW0vch(0jpS@DCW9X-nRQio=5@9-fR}9QY51?vv
zT8xqVpU-zTj#JJCz`<cKm9Wc=Zddh@KgP%ZWGUYz-yQ<zH7Xp)8%P5H4C)Ay?;UmN
EKWp1q?*IS*

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_xmpp_grey.png b/res/drawable-xxhdpi/ic_xmpp_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..eab554fc3eca8e3c16a4d66ae5d60463bd7d6f81
GIT binary patch
literal 1692
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
SVP0asJsBF6PPu1)CgnexW9XFt

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_xmpp_white_18dp.png b/res/drawable-xxhdpi/ic_xmpp_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..64c9fe0f95c2b722538c9b77230a6a0f29c39226
GIT binary patch
literal 646
zcmV;10(t$3P)<h;3K|Lk000e1NJLTq001rk001Hg1^@s6Abaaf00006VoOIv00000
z008+zyMF)x010qNS#tmY4c7nw4c7reD4Tcy000McNliru-~|p63L#sI#;X7T02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00HhvL_t(o3DuZ8PQ*YAhBFg7
z&O!%NP$1DzAud71EhuTY0cSy?MBIX&em66WgDlND9(x|ihNReJ{P_LZYZmQx-uusP
zV;3+R3T})!|Bro4IH>`lgZ<W8`-A5-?%uiQ&X_x{_GIF0&=KE-)F3IB0Yh#uCeOW2
zHT5mRl-!|EX|a@ktxgqq3gVddZG+FfvrA4MS+_lLm=Jcd<g}=E_`^J-Ht8HQu08QL
z2~_eOfX5w4No)8h+W~kfQ0-@MX&o+p0!};QlIF0LG|e$hzyXR2oCCH-!};!#%VWX0
zz?7|Iaw!eT-dp21e-eDjspmE;F(kpEODQp)LM}+0qdjZ2MQ{+;1T+BZ&uKEJrV5@5
zp92(Pu4p6loC6IxS>O<uBN)IQAXd0u1z)$@ch{0X_Kn|wVuSXqO*Yk_mKW+?gj}!H
zM}PLjF(Czpehx6$-qFw9L9+xJG>X9?sRI5K^0-UW;&Q-N1rCW?!M)o(K^*rEfE_MP
z<1dPTE#7e|GYrE^`2FRE+O=~FG-x-2BcL={j2R2g^czj}s>Cn|<edMY_UJscPC3%5
z-|<)kpRG00KbRil=D2TmRhq$>-Tn$I@fc5)iD~*o0qtsV3X{9PwR!O%s=&v>Zn!u7
g$u|`%J-0OR3pFCJXQgd`6951J07*qoM6N<$g2=QIegFUf

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/splash_xmpp.png b/res/drawable-xxhdpi/splash_xmpp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6d3a877a7c8bddac5d0bc95b82573f0aa2453e7
GIT binary patch
literal 16932
zcmeIa1yh_&6E?~&8zjLcxLa@t?hxEvg1fsr3k0{tA$V|?;JU%x-7UBV4<ww;^Pck`
z&R6wq)z-bWHPh46eNA`IO!pn7q9l#_mhdec92}~wjD#8-9ANw37YPCOPr!V4D(rz^
zDlaVod%`|X;vGS-2ePxwXE#`nrGH<*rw>`)us;#qWfdh6w?WvrtfYCLVqgTw;bbMm
zG`s=lIf$*ylBs2^;*+XkAs_P1sUs-~#3T?UR5TFGQwSs_a@qJz2`vV%>BouQAie<+
zt0G`vB$CT%NQ`{MqTZvCPs-l;_4m!Q^QF*3Hi>|S$Ln3d>Dl*=%F4yxm7di#Clx33
z>L^$cFo>EQfGi^l{J%f{uN?kQ1_3U%_w@i?t?0dYS{bk1_vHTpJLMBx9yfXewkvmo
zD1Bz^*ALM`krLj7e1Mg=nGW;rU55XgvI-aAWyyE=$8d&I*5K=R?P_VGr-J44;YW<2
z?kJ`$ZAz)6|IwS5fHP`B`sK1OXYTLaK-=VN6;rYlx8xaq$$Ay!zEwyhVs$wmOYy%I
z^&t;V_}B@8U;hX57xl-_tv&t@;p2d~JpyMDiuRibDm%2y)O6YZEj=kpFuE>6l#hH1
z`JXT4R2Di11J*%eBJX2k-1xQ%JMs=f&p!rdHvhL;HRRxoIPe-sux?Uv#SxH~v?|WX
zGff6ELv=o~Tu}KZT)b+9?%U}9Z&i!30w2>fAsGqotRL-L8?}X-a)!R`MKsy2duZSM
znH%11A}|~LZ}CI80RF?DhKC?AiIlx7BfuZ+;?Z@^;hecUuXB)$Rxas=@XCz;7@!u1
z3&I?WFwLDYlS$lZ{TN5QFe0Q<=jxWY*-X;*E_&$db?5s8_gdb&$)WxK><hUW@G(MC
zHHglf)x0`Mfqr#pqUd02{MO-$6&)>5c1xQ{eEbh23qUfK=_!72{%lJn_fIaOg-F}*
zgK6kFV3P;R2r3J{Eo1GHgshJh@GN&1<W+QE;@MSCt@j<@l7|y49t4H{$6X^B&f%}C
zjQg;o<Zhe&t$*dR(KijU^icTl8%7h%zt6l_0%`rOB^j+v%Zyfkr2j(zp%}P1z;VC$
zPX_xD_kNblf&f!<H=^KY3*7{4M2hRG<$yA}!hM&2A|=4g7cxRcw(_IH5}#lP>MjW&
z$ejZc%yA%T2;&Aa3_HF!d~cuFv0HYZz+(Rq$D#wXM$Jt0i2ntA=ArOd`jP(P^!az}
z3D^wjnV#B`wG_utH1j6$l1c=A`-Yyrl;uBluvxr~=aKrjSHH_L{DS=PGw@Y)mF-pr
zjn^39%s{4@FebhDC)_Xck!l}FbaVDna_~RM2k#<pa~O(ObWprTR%!U7g%v+i3m493
zg-{Y-Ik9`~^(wIN6fnvN`wk4jac?Xsq>e%7X<(KQhN)7b%lQpp)aHd>B7-Gc@`TKe
z)Jy*;Rq^!RuBw%o^snoD!E}s1l6psbdp>o!DMDA1vfO{1{-y-)1yD7JB${y)Go+*6
z6&oeU6hAk^1|$)RmASs{{ebIbdd)vzm*_2&`m9o_qjo|KKsJ{IH@lOX+dru&#QtGu
z(ASdctg?TP*6L0p&(gXeBT~}YkzH;+P0I>E=1hlE;<+~y#(!sKp|CL)5e;Y1?vzys
z$Lz#N9*2{ZK}2Kfl?qw@`wP*Zbb<ri@x=L`KZEiD8<W{xTN$y&A{L3g_#bME6E5Df
zBing=FiI9Umc7jzyuN_}+vDxzW1H-*kIp~9F(PfdAO4u`N<>YpPJDvUhI>sP<f)gK
zNb+tU@d*d_Gquo0^cd@-R1(V;=x>;dHz~q;L1RJA?K9myh)-7g)iRhj5i+#LSNyBL
z)ug?pJ)yw~y_uuZqjtgK6O`giR_#bn{BLmLSN^%1d{q#?l9zhyZ^4E)Nqw^g-$u6y
zu)gNq3vqieFynaOxtZAzmSj3JS^dUwMNhp&+uwq;&1z^?|65bH(&X7J4fL)E+Wm&e
z*GMeknQQz0>|UeQ76MztMIR9T)u|U}>zF)W-~FOa<xb=3LZ>%3FDMq|(gR|ZLEz38
zmIXYAvM-#5|8B@+3E-waa*{Z^;0om?_79TMQS8JjORgUk@^+WNbcG`UZl?Eb?;zi?
z&yzAuj%^m$AUNI>+)Hox%Q^}eGPUb-2eQjM3sC#^qf;PK*1wkj1HLFT$U5{uLO4o4
z9=PM4Aht{3v=*Mu-ey%+gs4BPLjQ)audcW@^CXJt57I+{X=mSKhoF%+XMo3o3J_~J
z6VBlV>!{}q7D)&?dA;qxbQW~5ai-^##Gw&CjCWflI3ykquOr7S=;t-%jH5J~B-*!p
zv%#Ey14D;F)-h&I;SPz_kcmV}Zhgwk#V^)*c!dUmt@bf7?$92om5EWU*5G4l6QdCS
zcYMj8f;xk_ZIeLMDp&yGi%#k;OsuYT5(x2wfz-Kq?|Eb2n0A3;qL)-XUl^MAm0C<z
zJ}P8+e~%zgq37p~`@T6taNln*8w_<E*!el$%+i0~N98)Aut#8X<A~=s#HB@hLI*Oo
zHZ^vi6i|r5i2D=Hl>KwVzli@8Lh~WaLx2In0%ZNpwD*i(=GL|Ec<^mZuN0f?7+a2L
z8royU@$Y9NF_0Ej4&)ES?+Np7$dpc{*Zavwc41VQl*N&+{PM`=Hsinap$?tOy(QPc
zU~q$mZHTFUeh;T0*cg9T7w(GOe{YRPH6tL5YvpgywvyQno9Y|D>J09%RaH8X{Fl{E
z0x8^Kx=}Oc)p@yWXA?Bus{CL2ebVDl4h{Kjt%jHu&wiD=+A_f@t*ov#n9u6N$e)NE
z0<$Ah`?g&-glb}n2Y_<PPs41)<u~Ac$2-4~T%pT67Mevpe|{HSCVKd9?6_!mWoF%s
zau78e1t9wZD|;CT6BF-77^XNOh^1&^y@){*CaFBpYn?S)nNU%M)po3?To>Mb5tTO6
zm1LM|VYpTDvUh;>X`x^*ABB(xFQ=PqRm?N20*1yr87tH_{Sj!LS+%pnzHoR>Ttgo_
zMS*`Xp*xeU++NZ((HlV2W9;QOi2nAPw(rluX38_t7)wQ(njw9MH#q5oT6Qx6uwGZh
zU1~s9Oz8380qUiMDZx$$BqPIiI0j1O0!=-GC((K90Zk-NWh1;p-3t=e0u3$_51H2(
zsUzo2$@!(GiVlFRPfZ7;8$IeNq=pG2DU5*V1;2M215$-b82bQ0L{#@9EhzKEKy-5U
zL`L7C`tkBxA=Qx~^5A{sZFfA$k@^W&Q{aNy2xE1~A1vOiX2;V&Dm+Zq5-1)C3$+-D
z^NdENBCDm%#e5>3wfn!pt4@ySiKwRuf%C5fO9zhOJJ)3s(}KXA4hB?<Td+~s8}^mb
zt42l|Gs|R5=ZR}`bHPm{An*E7Mr`%OM((S&%@-5GnHcEWv2p*fkwpOxo$Q-<!`X_|
z&n8kHunsN;`x7lHz{bz=Nybc=zC2ickQ=J-dkk+hb-W({k<Y~=7JS<}?}+U}P|qp0
zzwX_qc<eC^0LZ?m<~e4Y5YDp($GCLY3wO+_ESg?<7v~ljfWEO*NBHBm5kI|)TTOuE
zK;Aq#LPSSFq{^T9JQ#CCnT0Ev5MQ!pT{6W^K!$N4WKz3AL)WyWc||pKzni{_3M#QT
zri;1}vl%>fd>GPO)l1VAj)!*oZ&|Oi_sEgc0Qt95<O+2ScCSC58L9ews6-?V?+-^q
zK#s-qwm%~ip@EPCNSs5$)Dq?DrT-c+j@p&jkGeza59`E$W+40RL7B%)%HUFU4Y?c!
z3TH=}HU)@mCK|6Vl)Y(<JeYi&8t+tW6l7ni#**XeA<(hDPp90)iKvkNSGA$b{#TXI
z+(%$)O|2b)-ULYw*e@?(l5Ggbbbs%`gWm8f{006#o4Wx`mSOi)Nof+H>^3fpU2T=d
zle~9FOoLfFw#fY3x^*od=kRoGnxqati6Ump%i>mAIZOrh#Ws*!74Ku#dViFGB24nb
zyg-pue)C}u;F|`b!jiDBkX4D4et<1SK77raj?8;m;~L>Tf@(g{#bC;7^<1_ZiStn1
z+zID&XEFsw%myl!Oez?ScOi*hxz@YuB<3g0mcUO2V&_|M4tTDE=__ertd}xRPUgL)
zwDHAB!^ctyr1?!grVW5w#5Gdg1`&TEp>`qRJ)7+pr$r&;Bd{N(t;Uy(C;j7&Ai8hb
z?eG`oy3aX-5`%tKYOpEFxn!+?K~;J1z%jw!eC}v=TUq%Gh%at$D;MkU#~J0Z=Uam9
zKGAb8A^1TjnAf711U$ZlYLZp<1Kdho1i}q8n_LdkabS8=8z}g=homDi1hBbU%E0&?
zgL4LJ<c0Fb<}E^{xC7|SWIlW|_L)2%{sLZ2{F}Z+>D2{}efccl`O`g)T&FOJ{q~8O
z(_|O&_?$pAJK?A8B8{`Mae&*93zgI>J8s`Xp)2qn%qZ;`4v(Q@4{nv3NEaQK<mbb^
zV|0U(geofxINz0JgN3$76SH>UK<-d@=qT^WKn|a*Y=%k`ys$8GrRFy@;Jd}dav!;T
zWnjz$!IZTRwv6Q?ADh+*xb3DjOt5ym<7GZj2FUF!9&*zlhs2~S%VMcU7mOdMWc$&%
z7_C+O?-zb~Xr~<&+foc`cdMvFTUI@&9s3HQULcP)yDL^{+ku`yEdpK`4bE{qPmQ@u
z2`}%v=Fn<30#!adX{>g9eS)Im@hFM&A=-Y(yl9y+4UExLWA0=zB({$nbk`&~1R&i&
zmpzZN5$3S!b%59Cx%5+N9wDA6)KCh5q4>=ixH#6ENSnUB;{Nw<(pN1H*cy+&^|oc3
zFLj5BM_$?<K^z0t2xIzV$9@LRUG)IKjSg#)$8g%%8V{zWj!^+TJEP>7Zzp^>!E~)B
z^940bPv3Njorg-u((SWGN~K}IHq0!WNueKmS1<z#Ts^*}u`<s=dnC4|uBY&HEuPg6
zOS7)A(M@9yUb3v}sCb}->|eQ+8Dzm9#P7fP^=k6L#2PjDr><Ff_<;n}H&fjPwd9mU
zLd2;~z9I(J>LSCNI<E$~rl#|BawNRw0*mc63TYWWH&Tuxo@C+pjK)T>8V#Q<D15X{
zHc7SoBhvD8s@MXjG|hJ0P8n#fQ<&dNL_xhNy{TdW;05&;u@F7c`Vd^ad<$)%#EqWs
ze+xqx3!G_)Y_=pFYk4)@5Qp3kz>sT^-yq|`gA`We?`8!m=D9K^WM^@FZ1}?|HJ{WA
zNpeybS`u3?=z4)5VgVVAqU_IT>TNdnL{3FJ4dCLCDsqX>ANVp4->(&lOBJ4o>#8&t
z8oQdR;Ro1tKkNbt4$TYtrub5|UfcgdCO0_#NY~O?Vxi%y@R<FrJrOgm!G$%e#BW{k
zpsABv`kp(UDC&ODkfE3I1^y!CD(I)q?1>;7faD4~+?g){Ta#Ejiz&CPNAnvR>YMNu
zSxNB1*b`3pGJaHtGR6bMsal7FSUOGhX-!LYmj|Z4AJH-d((t)?Iq{rN_&5PXodq*K
zCdi;OKssF0Ahi?4r9G(??H*X*%{{y@S#|x@c)LGvtnSwA$FJ|~h{*1AqC)y#@!xqR
z{9GAF@=u>!Z`5~J8U?^#utT5Hiu7%#oP8$;E$;cl%?>pOu$(zdbaFjP@2TGs8?<1B
z?&qbzUwjBe%43lwEW){ovFl4W%H&ctJ2m+(cNcWj|A&h%ImrzQ*GUSt+6So`AkrG6
zdmEb@ssI6}Cdevwav%8}5EoJ&rdMbW!2)S7L(}hlOwd4QKKm+i6H7C`%h?~}i=~4`
zC$gzY*vMJo_6OR2Xl!*OFJIlojYiU7=~VYODz@taUq3r|4(z8D!O)dPGi@4Od|h5O
zj56Ow<W!76D-ZtN!Zga9S{1^;jTBrN`En}8B17XiiuPzuZc(2l%Mg~CNa~h<Do1c!
zSusI%b#Rb5uN#AAKF>K8)iJ_v3?9_2acXIn<J!7v%5wVlo>sxQ>x+ka(_iFu$$9MO
zgj}t0a}sC7IrOJa5oU8+bqoLzG(`04xC&^I<b;7$E)FW@zL=}1SRQyMy9$86r$?#B
zTX(WKz*R=f*7o62)QiZ!VV%*r@$;Uvq&^1=7@L`$N4SPpU0`GBq(`yw&G#UuJ{Wg{
z%Dk?XPP7m0g1>qp`9~<}p5<mZ$aDih&S$6r&dpym{XYWVIh+0*QS#LX(qPp+=uxgm
zC!q~J8{z)c)a4!#*pB~M-#5}%tjf02j>L;%fcNBiXxBB?^MYRNmbTEGj7>4s3xNNP
znew0+hMj7>Ib@G?!_uSQ)Pk68H_}!0Fz3%{s=@gValM?eo_%O9=k<>@0)VL3GR2Hr
z%l&{v=dyvm9vN3CT4`kiJ9p&Fm>Ug$8@>0wZv3&r(F<rdM?SeJ6m3PL@*#LZ)}j8B
zI%hota(_}GeC2rEcxQtPlmrR!>PaV4RG~u+$c{P2GpiBZd6((1>I?LN=S`YiKKIFD
zGkC5dX4@tcy}MM<-g+ezHSR-L&PRU2Sf(b^TyQ52wtD;<=Q7mr_iHNr1teY@*HYw}
z`BYcE>KAw9z%S0G3s9BQ##531y)(awS4q`&e!ImXm>!&g`KMY8l`F6T#I3Bwfoq2Y
zI3Vf-gr+&BsGhUaS_<<VtX%5U!<q_254CUm4aHt@*a638*jVzK-Z1371Nil{rOa3P
z1}02ucX}77Qph7JhzW|(b6z->sdCw|nPua1;Io>cOGACRiCfxhZSDQ?is3Kj!!NIW
zq&K+wUfxj{PZeRr($0p0(OMDnC6tG9r{ajO#}@(W<kt$@j8R(n3xu&?)IH<QSRrx%
zsT<Q6O)c5g$HFCLa>IUXY$qau1`lY?>?3BLHg|*hs>S>$C#2RUeMDD}J(!tca_TIa
z;);u3FD`({a1kvdBvXnYs6NA$JM}BFy}sLD%Po808s}Q4l&%+%)<EIlV0aaYbIMz#
z$8`Vfjb$v`1e2_$Ar0p0B)CGxnMnsti`)ZEq+r&$?x6#sIMnZ4KRyN;JN3qkkgsg1
za25!LH|`(=+B?egQ46wWWy78K>GAnp@3RXglLuE$+vH4sunIZBEmWf-ejj!#?M$qP
zf~8&_B`Sz$SYOgP(Yyj84xFs@f3R!6iKDcES;+Zn)|)4d!yu7g)K`;&3tFfBu%HH;
zHQ(hVC*~$jIwlT1&IO92BUtBj=6*N0)Sr$z4`?aMul$&-nkqSB_ow0)M_wXwr|8?~
z_-r{^WX?f=mv>O|lyiT$AhNw|D4$nuMWx3#P_q>47GI9_jzYdxr}NGUay-v3l|o{+
zH+bUHEb^l*6_W`kEYhPbFKYAaJBK*(7N$A7k^;}l{uP<hL_fg-lJ3NLJx-P`O}z{e
z1$wIEKZ!=H<*I%~lGah61M80m|M-;Y#-_#TgmaR<5$W{c^CXz<CyKp3;68umdO=#U
z|EjvGE(BN&z8k*#b>hZ7M1izE%2j#2=5*V>b*)c$od2O;2iyPF+w4#7n_w<$UZbqA
z5{69vU=nq0l|P0QSDDRxTXmg@Xszl+M%y<#ldpmMl2DVr&QV592M=g@+W5F{PTY-<
z#ew+w<Dw3tLh#^e<=<kGfn{FCtu@{l&N4M%?6)eV@JfxZ<(a7B+n-rh{W9KVIV+lx
zIF~w`QeDbtsi-i2H(?~44%4;#e(+u%y6IFeI3{;4a>TTuqP1IIx@L{2@MCZ-NjR*(
zl!6Rc|NhbGMpau8n>rs}sZM3E+#PYNhy6mQvYUGqAT7K5#f<w_wVGkU65kGfHP*Fi
z{jHR;p>&Czc5XcZnw&A&>LDFMSDEZJ(Ir?Q?9NB{(n;+{6Ew|h4l=m~6yU1&241oX
z%c?VFh$?jQw{3HNm#@KvVf!y54YtxU1U>jkWnpFdDMefEE5C1&n$38{*c|by-D2Ol
z!0cPZb^68EgBzZ6#@#CBW{QdS#|rIS)#Tz4uFY3FnRMvVG0sLxjqifZA|XsvJxGfQ
z6fO@I!=X@5&N8>31r@rqpSA;zX1;ndV;+Q-VRGcYnnB)uC2rBgZE{<>yHsSE4qs_z
zySHCq%i=862X>@ob(SZHlJkrC&7!r~c8oZ7>cTKXj<$U>>Zl?Ji=QJ3k{RONQ%xH8
zQLPU<g65dNQMq&<mR1_xeQlZqr~`5lZ%Ac2A6Fp4!4ETagYCwlAYaVoIHWlL9}28}
z9K2)#*ca)+xv3S){D{QvF1_j3*Bf%OSu1s*_dk2R(EaL{nnK}tY<9d~Ye*I?ZGLt)
zcA#67`$WmL%)*vKVANDOO#|2QF4CiZEpM8lqKz4fUP1Ywh2s(d@7CVOmI9nRy;E>G
zMuNDz7d0&c{w!@BvrzWHoR;djE$!9L*BhSaC}hFj9c2ao(ZXsEsOl~6P6mc^>jJqC
zupVb*BQA-x#207(z@F4~vpjcwq6sm0+40vTsf(^(`vMHJCwV__(iRuN{wQAf{CN!(
zx^oUA&WRNqTs^s<Nt(eKA+sjlPp2eoURL!4-uBZwD(<TyU*e9At02wMw%XW$h&(&s
z7R{P8UyHzb<+&}MOtlyEM+pZ`fDWEgZbhExxa&r7AlE!>54xVxMHtX5D@*6$69qlA
z)^<vl^n!(4$Nr{qtMkW3e^|wUWF<d5a;!q$s29qSQ8=|QR@cMP4*w>O4+sj`BPEoE
z4%#D-b6(V^>?{qRaS-2cH6qzVbM9zt%8R%?Fpkz^2R3`_;nOHkf$XO~%ziz8aKnYR
z33yd)SoTkYCY^_a=BTdFkIRdsxG*CFdOf<ie&kWFb-8yZLo&DPgtlE&S}Wrn&<i8(
zN?b}`z9Izc^mL(!{L0ujv1SJZR??YvkIl`N!<SxltW%J9%r5nlUbTMw1{}!ZH<j-w
z9nAS<M+kZ^8kaMtBFTJ03BEB%>TIcH47$k)g9Z?<n57kx9?6L!3Ia&8ukv__^)v}*
zsq3u1+LmjEfjsGI`54Eis@kz15mzUid&2=pydWXus!33Sk@G4IS~6S3)0N)ik0E(3
z6lSXFCx^|*6~?CVTa5{!kgeSzbxjtFt}}qL8ox%FjwmUS`-?}?2hy5!aG$~5uUd`=
zFG$;D%OqAt?!&~(b0$pIP8cxBvot#Q)<@WMn$2(Mw>wuH&rjZdSr4qEedMw_ozR|m
zGd=Q`PuQzC$Daw+<Ja6L#P!1QGJPwIpVOo>f(AmtPs6hhJz7&;i^Ofmx(IKYD>ach
z$f&L)SEZNs6K3#t)e+ap8u3lr+Iz|dD<EK@g107gNeiXZeIwd;c!MitSJl54hV|g-
zOzu7huKUzV&1c+V3$cpxgShuuUcR}{t0p%fT@l4@ZITR|TKqI=55V*W>p1Otd3hPt
z$8pjF{GiF-GM_-H%xSde0ynBXG@{0rAa|88TO|K4_U_#ab-7IG8R*#Z@h}Br5^lE&
zZ3B!YH7<IUxBJqA(1)x0kEW9EqdAdU(la7tmlVKT29267*qw3{6^%mAmsfhv?rRh{
z7Cl1SKV%0D`|AOnFkHFi4;tE(eS1%XwVc-I(M<!qpgJClx@i;MB`8*g?E;@cTxOgX
zgG;;51H+vhqz|vFNP-HJV=h*t&k{t0GT^OspNu9+c*U`SqQ|)EA*ZuNeVj=#Wk0BR
z3RdbB1IwCKq<mKqF|eNWk?JS4Lxl%6^r<EaEo-S-dh90Qu$zA?gfSS+TP9y)(0k{0
zM%?hiVgUP*6Se8C&AW!a=<#!kb7M_+QsiMb-BNmhn_IJ5f=V;z<Bi)>@vtow^<MD+
z=5lWM?)+{NM{zsy6;VtJsiNdTxn6qO0ohal&w&@NQxpe|0+h55Nwhpg+1aP_b+&q0
zYFlT!m<5{=!;(^VAXYEONhs_ZV<k}KP><B#5BjF=CyUUgvY$ObHnaZ-<S##agpw>1
zytUB#;UjL8)l0Z7vI14d!?wQ}qoKGgY<GkQmnP>+JmTL0E>bXc2Re?k^Y>|}MQ+wk
zw&cz}ew}Rbzq$v%GacXXt&)!WqsqhjK{o9DhSvX=3y@3@FWOmPVL_N6g6`F(T`UUT
zQXj9)h-OL*5oVsFSgrTECh{$?@YHs!5!w!csDCz-E_t9*e<wF<9!`ZpboYAWobIdn
z2_ziF!oPL$ZlAkh{qvz7syA#VZU>VABuOtMyR;;4zLSu*Wz-X_sc&*Yxug`o!1WYl
zxO=>7aHnKwl8h^5cc%*E39^p);jw0e-nxyI|I1J|$qy&HY6Mlv*zwyCBQ>fI)+4^{
zsedJFhY$>opIQ+0v79b;(Wz`mTx9*9W$tBnJ980!b_?$k(qIB#9CtB$6^DOCmCe8B
z>Yi}=nYU_c&)~TV&r(Zm%6;+llg4RO2x)xCr{&!_fd0oEnHXJ;Q_~wamX)WZFx$+Y
zlq{ibtO7Tl9^Mh7kSZNhZdxI}U}?TP{);oRuY%E5Y822*3s3hpG#_yW{wC3c^5s_H
zo<u}lV>?$`*dX;XW%KAsFMbebQ1}TllSJBU>2Lc97a1Vg0e{XV<SM-N%%x^U=}-XF
z7Q#}GsE;x1IO1&8BXp=N)wy$wP?7DH06F```SIFDCIzl1u}y{9w}+9s!gOxl7c<mz
z-^)dA4rOeFl;qQ!Vo91;z7_xCkg9Q0E#Nyh>#5J^e$?#1JW;Y7Cy%g(p2-&e<>a5{
z=-wYcz9BnA6VVw8oFQZ2wMjlzB+ms5wHxQXd9c*<K?x+PKh>;yj^iOC7^QQ@`s@$h
z62A>W<-)2%)W>{LvUvTlVxXa#X33EQ{q}N-6>}`8_RKmeb*QIU-hcY$)exrhGsCuJ
z_zTIh?VI)Up?lw*FWUc&qeN~<LeRDC*CBmlp9*>uVv-7Mp}a1Gs;~sF$^5PUi!d4{
zD06ZTMl8@2)n^D&cu2^cL5p|~bpunIX57TU_w(3tfx1Px`L}+39ugSay9?O_r%knA
z5}yGc;wqLS*PooEqOB;{pXXFigRMp^H3<ujTnKDwp-$w@S+NGSrgJ#rJ|IK#W0JCm
z($w@YdUSCp=@r}j+tzThJ|~&Mm9{r^#N<(}D^KZwU7{v^pb?Evj#FDK)m?yl_fK(B
zT0}o+p9<p@p)X*Iy6w+fh1sHZ?8r^1E~iY;3F*Xl3#|OjA>zmnq07%JDx|@o<)@A#
zx};l)YR!m(Slypk;t!LC@RE|EZpF!)1zuVLDG5t8fQXRx$rg=%b<^P|j-Qq$CxsYw
zh=OmsLTZY6FvJT>sV+Z!kWD^TB3~5gj?4W)vr*{Ni~^j0h?99}i9A;(02?XYs0lac
z#}DcKK#9V-LWIctnEo)JFm0W(s31{XQt84HH>ah@^O5Vh?2!HB{iI3Pyt^Gln8$cb
zYW{LLW)s2&h{(sLCk|w)*S_W+c7QDucdq7sf__&v@g|r9707Y&88^!`>ogXF*`>W+
z*kttaM@_MM>8qsV@F?s3k_+^K^?!CwIJKryvf|1S0Vnq%{t}mGT-O^ayutX6n@PX@
zU3TcRjOqWK;DmTQN<3Znk54~PDx>E`Ys1ctC3gcVrdp+lazqt)=bz#yUB2Pu?rkga
zZ$(WP`Hho0f3pyGGC|Z30Ay0B;%0r*>a2W<<J7;v&@hcs%QI5`<>JPt9JSKOb)2Em
zD&X-L;qV4hxp5E1X66f25D{-mpq#_ftf#kS{zCE0Gm!D+oEKvQrcRt`E06A<U}gbL
zKd1#ZDSLn~nqOi+1r_by&kf}M1LD)!NP`8TuT~Khq9mRxGi=+xI}T3g*H|C$7Iexn
z>kzYbqhjYG$d<hL_V1(iT5(>uxDOwvLgqO6khc9p&%H35?qg~(rIU*s#IN-k<y8^&
z2~Ku6dXZlRw1+Tq3j~3BJ52g%8iHHON&D>sbZftHl*6DRv)uhRM&c!)PR5C%ZD%x9
ztq4j#^KY*4w(U&iP_@EI7D?A7iWr=XDp|!$S2T>~fv0wVmYY>$blzm(+4`}R({8JR
z#-!?mPFkZ=d^BCf&5xtv8|G%`Kxx;@g{SxLnri0H085gA!~Vyb{RsDTRBLFNU(!A3
zFtP}$WZ@45LOa|}eA9f}xiAA4xRU4)X|AMMmP6W~rt|R#MHFGd4d+;Kr52~-^{;Sm
zgxkp)Od&p|V58aLF1zKJwLp?PH$!~=xc<nH0(>A((s;?d{8A-eA4il1afs44d<69n
zvYqex^;B4Ws^PoH_MzCw-Qhb({!wG@-F@|0M->@abzzfUl$<_f-x0H2o_45rpH`oS
zR|&EbD^4Ermn%4Z6N)N~qkUEBwjvF+DcnlSjKcXhf+uHga=sQ^RIG=>4$DcwYQhr<
zzf5jpOpb`u7CF>6Os95h%`5zvZTI|#EKg4TW9WkgWDm~yw@i&oGNOgHVOw9(9P3BJ
zF`5}{LldZc+-45+UAAE!!qw=-j35!HEFx%X2z@W8Zy413<S4e$;j^EjK>isf4D%RE
zwgKyxw4c$=y^N@y#r1v|t+6*wg%l`O_8DK`?k*Ry+uwgSg~f~)dEm*GAg#|s?nwNn
zyID1YXq17CS>)G)1mZ5BMY{3?ymWmt^=M{wkM2S|C&8PhLjnFFCN&t$B-!t3sf7}0
zq5@bNd|$N*z9R;EFLo31@UgRxvBkrAT!<6%JFc7bpeY%TKW%<|EH+G}f*p&;7cYt*
zPC6U&?r`}^+_}Gkl!gFKOF_4u{Y5pBwLIauW=N}Sg28KToW9+Ta2$etXEiX^Iw()8
z*+h1qBb#tt6)%?ukCLIyyjcdnW7kTo>qXioy&AC+a-GIK7oXw>**hxF0an`Pe;8x?
zym9Nz_U@a0_l#y3AoZ)<5^|<^c|^^9RiCd#H$A(qW^W}HC-G#7uzO#A0{;G?WGA&K
zQ9q?}>eHs6KZ7A3JRss*uvnMtkx#fB`+g7m8L^O2-V+)!+rt=f$YdAD?`SGPfZH($
z5o^o_r4T!^;K)E)nf4in*q5{#X(;#U#9w+Z<8I*|{GFxyZ|aZ@)2B0UfeF2T>?C7Y
z->GnV*wD3Rvmq0qKhUxr_y-)UWoZ_g9f64qIys1>``Xx~dy#uQ4mbjdLPQxOzLks1
z_cCm{<J`PM3B`^iz0`_TP$YR#tF<PCnaV7!Zw6;O(qydfBfAP&Pp~G`|6p2gsBlj5
zI4&nhxOe|qNW8AE*@Ig0Z(ZxGJ{useH#A)G?&y4Tw;Y3QY}Z3w<gRDKo4*9GyRS9l
z>(%9GLkv3?h6!%pgii4BMdZ7&bYZ#=xs3n#DNRmBKtaG7;1mAD%~{3DO@MGm!|f3j
z<$uGuGMQxG0d{XGj2F~Z`%RnmFKW+xzg}iLhcBp1*g>^L$W@(Y)WdauIcJW*yY*DZ
zN^5ZJkH~t&(Ms(&?cN>w-R=dKe|r$`dLKcm7WD~*y_?^MY3f#Nn~1mE<9B4bT}r5m
z|AKyMt?K1+kvU?Zneswe=w~_wD8<p2ccpR*&g6bcTNIHz7Jb1zQDck6^#T5^V{@I+
zzV+~5bFxc3W$o^S8rQOZvoYH+Yu0E1xtp7ImFe6Fqs3<q{tV9@Tc@VdI*G2mrl$@H
zr3^f=$fsn`8RN%70WZ1tvrlLU)p7ObfR_6Cj%9_yXHTWP5T<3CucfqfS7L;lXFTQk
zr2P|5D>Czl;z2NfzFPX>weNR~V^uSD9pd^uA=_jiVZse>BaQ28t9syh0@Q@JcIh6E
z>sZI=6U?2xO5UQVdM!TPqmO5(mn_3KzgLifqr*yeG+nCtNgKQU!x6-?ZEoK{CiLy>
zlNAoN;WoRU=jc+Qv*5#4;;(p2_)ySq*r|W3lg4?pj2TwPy**fej%Dm!y{Ed`lRgE#
zW;W6!Pww;JnL&<I(Ag#Rsucg$Ut<D0OV~!n>R_kE1!N5|Tl=9i*82A!dob7j*-5sK
zxNC<AXdy%wott2v64rai=!45(FHf+g+QVQAp@Qj`FHJX$f3CIv`}Wa{WbN>@Nbs`F
znRoW8+8-k|zj3F+;K`OA)5sx?tRw&DP>ZT4*qI{T!R`zJ()4iuY>@#(iurrykN$?g
zaRJ|gR*yfYrAkvA!xHpltZP4E*#%NY81HWV>Tvd|JV^H_e}4j&A6U!ox3Mpwc#V~O
zjTBrW9+PV^7k7R1J#LGI04BXGSYH1k$u|C+&Cq!82}G>_A(e)GwyLJmwtUR7tuMzw
zA!Jk6@+k*9Q4&jy(L!@q5|u1}Mwp(9hJNhL^s!ohHEjppBzE>@*vA*22kYEa(O1~T
z;h*mx4^TkXt=fmD$HS+Vyk|Yh*xs?~PQ`$Pm7lVpQMSNW5iw7>PX+F&t%wVo;wuKZ
zHPN<dRIqjF#?%CIFJW(g&$St=p8@9QE5i_of!!}>iBMRG#K5*B7jIlqOSejH&e2A`
z_hC*0(1#`}$wdoq$;sG>1FA%SQ`RBW#~(3TjwH5XE~hbdtGaTx(FLI)*eeM2Fnfv5
z|G(~!hN#*)+w@(xL1NH^)Uhw_2EpOO2)`!ztM{fK%C03*GG4!GwlB}!bK*#$w-m4t
zGtx>F0U75LIQ&l`wLAVtZ3<*=p2Q5vze<D;%eUWVMG2Ud!qdqawZ6ItXDW&>u&Qt)
z9uziwJ%F8Qz-}pMDtJ&|q{`kqsq0dz;;O5j)_%ZBZg8xTqZp<2Y>yVo<*8+u8vhj)
z<r<`%`NG7}rOBfXL=&^pbuO<^+`AKSUjwzVYm#8k*s<R}@+rCOyuEv3@o_LT3FNcD
z{XVy}^mL$M{&ZRaKiPwl{2eTH=9}XC&Q;fSw77WMw(JHw`-<42Qj+xAH8LSJN4exU
zFMgAK?kQa1PWxN|hA<B1*7=1J_LvdIHL5)6-L|hLrohX6=kh5cm+ni-gjWHV`)XlA
zq9S6j{Z@Hxb$G$`0`?Vw^WC^!Iu+XX2L2zBNC7KF!{2#OWMbi`<DE&Uu<uHbbOrGV
zsnUvVZS-MR#}B~+Mto|OcQB{Myu6l9AHR*N6Yvqs&II*4R%GVP+BU{y*4@0bv~f3+
zcKD5fV=E4!pXRu-H)~b$N@`Vo5myx>3?3c3*XF7q>oZ5n>J|z*+*HfH*-UIdrGA?l
zjV}g8*g~7$&E+>a1lDXmF_T`F9|9{QU>6sp7uDmbQkO0$uW(pXVMf+8UoNDE#*frp
za$`Ib7XL6UO^L^5z&(^)u<Lm&9(GkTTnNT`An_--+GeNmMmexC<i3lTV;@)8HtlvC
zK^;rxAiMa3T2tS#pbUAqi{JQ)f4#Y>vvqp2xrpOK8omlYS(r^&N)xxk%5F=tA3aFG
z(=J8?>A&WkGfATh$g=b3o*N@id+(5clY`d(It$CbP%358Ek%yoJ;(22cXdCFy>z(p
zl;A7!YCL9lUN-u<wmFy3__v2le0yS^gHErho1q99hAPXpMkz+Zp;Gqy!eOh#Lp?L^
zpzw<smkJ>>>`OC=)gG&UPYLh091jJK10M@Byo@2DNg#iOZ1eg?b^7e#-#USU4W9&%
z6>RS|d6Q)Q`kZ65-~B})upIWCRp1c9?Ak!@Jw5pckoT}KdHq|j(uM}%#Mrcp0W~cq
zK?yc55}m+~n?byjTq8C{&SeTc`#$kA->HA;63MH41}uVuIhcux9UafUzv78ctK%jJ
zYi4DEcG+W2L-9X8(Ao{G#l0sMSe%_2suS?U5@;^IxAQE4*^bQj`b6`CKdRz$W{BdI
z`%>u90VdeQ6HRqd1p9}SRMiBIaPuO@eG$f3L|ypQ5L_52zBAN#(i6oa#1y7`DReO9
z&96E)AMW~lMJgAaPx6Fk^DI7n`T?PV8Q;(E^`27(kNY9+ol~B{_n$>#2I^y$&%P5o
zOa(9N?3wXydfz)hM4MrJth_gP#u-Acja^`u_dUP=TsuGlWLISk&vr_U1i8{}W4K??
zEK~lmaW~U0^e*W0(lu``=~gf%BtxVmI`*%|Qlx<S7J8bMj{--iJ!HuV67L-|j~zH4
z&|>4evZtI1uUFUgVV)#QuQ{$cc97T5t`+T9hZIqT3tfn@LryJjK@^M$MW%(cWr@NU
zD}@c56-1vB8q1b}acMTr=A;+6UrWvS)j8*sFitu~JL(rdQj^$)B}gsWRVALYp9w1b
zL5hdPhp1TAOt6W^F|T?ONSO&WTRz_C{MGNMa*A!b#tI8atak5?qgO{g{sbj;#^cQ$
zO@`~*Y03Aw4c8u-3(>L-VAl%58S)EYtX?|Of*l>KkD59)&v5Rho0=$0^TS2`WDIvl
z7L2oHx5X6DJ@%htrsHA^hAAH_|EoDa=m^#63-=6>Av;O+e33Xg_d=vqS5Q(UXjKL_
z8j*aLB==nF(8pr$ft{e1;j?+gID%87Pu%lQC59R&+O#mXEoQmSi;$*?HW9+&Kcy+j
z)qB#rVIB+$PqN!gk_T)3ixW<Eozky4fA{q7@=(;bg%;=nm6HqvPXmrUq8BV39I<4Q
zVeD{@Nmk3ziaL4gHSpqmZr-m_2pml@0+^sXf*rBLVF`vgutvvBFSU{&XM|F-3qqOB
z<sX@|KU4nnQFkEzV##sh11oYl!Sr>*BGSYPh6zbg<^YM>(98NmIP?`VF0$i&$w<qm
zo+x?)%NcPr%(R^WgPgH?ekSSgywpZ^SfdU*>EG%-cB3kIEj-0j?P(*&Qo&LVh%tJa
zvtZP88r<<40y|_;>;ssXqvMpjgZBb_w=26ufy}U5Do2w7J6A6t@6Jk8J>9R%$V;M&
zc*aRX@LANJhj`p(RV+oYHqsH;NNh(0D<cyw-kUz2IMUx6773qXw5Cr@QHTsab$`G`
zmN907ZFhcn6Lf@uocr~RJ()hcCM}Nrd=(_y67LS#i+i{yq$UrhfYFKoAJCjrfw6P(
zDtjXR-)EKvfDG#&d0tw0;vY`5;~x`XLW5;jU8yX0mQ}-uU8_Ynkqb1%{@7T4e$&5m
zkcQiNkOs@y(I?eYcVq()Uu$LHWqDVv8gukDW^BAL@1NfK=0(E)%Vos}*1)rb7nV21
z!c86#E5rvBKS&#jekIK9t-EpWR%A9juSkYjai!k}IRe2GY{snAY0O+)Od%#cMMFJC
z>ZtQ9$n%o0k??$OCeq+0t<lVbP$JV&IvMoDe`^amvUNvI3{l?P1!c0+kOw=$OyGK4
z{2?`L(}i~ALCpW&XRTG;;mMaT{9+h#OX9$;BS53_{vY-dxi$tdp-&fJ)gaN;6aPYm
zEn*bodINuUSmJIUHZ1a(nq<`b1ZTy8?#gzM8_Tqc^}Qpr4MZ12ssL&0ki5-?iHHwo
zp6IOh2#^(i{OA`5O_0{Y8~Oq=l`ysnFLKJhszQXZB#R8oGQx?YTUCNP>>xs65rdt`
zYlnOL&A;}Z%q2@-$HM4f!WhC<z1FEj-d0FM5baEwKFkhX_<|kv*TuIF9o;jto@QDJ
zrd!Xn4lU(RaEC;C3WG6t@AIgmBRa4%Mvw86x?BA?r(jhQXkvPZ)Nlae%a6myFMhyp
zHzeI!o$>NPsAEB&?2W<?k5ZY*VV3JnSXI;p^7e;sOGM(6F&+uWD*$ADiI<IIR3njX
z52<um=DT;qYP9L%a1_$Ew^3+zZ`;w`i9cNk=W4wUD~VnBgZS4@gG1|-&h{qQfl*8I
z(V7D<nu!-uzh2;bN1mwBs#hUCNvFr~QCChXWNIatLD+p$<U4=`y{?JPmaLGbfNkur
zJ>?z5l?GjD{Q5RN_|$0rBUI74X2*mY)G4v;Hhh>!?B(>E%9kvdDXRbLS{OuMd>j(L
zdF9bYn7{d7Rm3zRAp25jm_#Oi=Tpiin$J(m%vYm0Vz6NNK4I>s>nRGiTh%X8iT|o~
zg0qpPTYCU}*dxrH;9e2Q&Dl7fLp%xLxb@I|!WyaTiH?<HzW<73hQGj}{`MdKJ3J?&
zMB&>QK~;$o^7YY;s)M41vMqd0<)tZf+2McnG%~QJkM_e65P`((-i;4LJSbGmVY|P3
z#7tX%6H*Ud@ya1a5a-R%{bE!>{YM)YJAY;qqYZ9^UO&3QrBCJ2O=Wf+KZ>N>6=mt$
z?HXgvCrdh5A%G|_6eGXDkc5wdiWR$WS43))KQgCpkS33Za)|s|pRWa@Z*~mbu4C!H
zav@P<kadQ(M7*S{3lsbJi=ufZmh-Jbl7G5HcZ6WfKF)62V>;x?kI)A6-}F8tz@c7a
z$?!H1)9NUSPq{%zAk@vK5(z#KXX^xVzOdHd73|FKovRk3|0_Is2O!*h16h`&M;vlt
z^(Bq1VvnIfCK2uNBERnBDrLj95Q(RD5l>cesfhk3W>e(pX_ol@@nyus6!BZnDJj#r
zgeqT~Bci@1D~dLh!@?7Jj;=jsEtqM5)%1Kwf<rx1li}TrNKEN7`0!9GbDtbmM<GQJ
z2;OJwO!&$gcJrh+@}-&bw8iG%WM$&v;*RBHP__oO!pg%BRn8=+7uUI6Kj3tDO8kx8
z$1uI!F*mQ?XJ~x;U+WyWxI=_tdYOv8{Fz~+@cx^jH|mF<Qv#O>of7!*WSjI=97?Wc
zH&-NAocRCEmQWUK$>CYEiXiLL7pXUM86#8KBHRBr3{p!`E`lXGklu^?vVnS?S{Y|A
z#3={F!jFcFGvz$+qgtY(506ke!7$$_K(T+6bY4N?Lmw&7_UG~qr<$}i)$gl>9Kblz
z#Lma`r^2%H?)y>vo>a2nlKfP2f@bN(xQVR+-Bl#XH}a>v%N*Wi823NnSPKIPJAD$5
zf{R*}-FP<&A<H~ZsSoGeJsQz1b$wUV!s=T#r^4<pJm$x{^cmm&NgsqX4ILnzm{|*e
zlckrq6tMifHpg6$3*~Zb^^`L0UFD=+z~Ff+BF4=O2$hw~X9aHFJ%o+O{K3d)*Guyb
zia3j|TAAX)?e|F(bQF)5h|h9pUU94@SN;x$yQA>U?4a<YP~}lW4U(wugOriM&iRUb
zxe{R3+s8t;T#~clUGmN|#JN3-f_|JofK;eP0!>P(MK$cxM6hoIKZ8Hg3W==8<AaU6
z0P2&lE6W|N<0cB$hd5Y&&c+GFj6rwRsx?v{kp|qP-gont(h1grJrOTI2C?5pA)HL{
zmo;->b?wn$Yu@<Y{&w2eIhoCgIw{l5gxP8<L$GGKa$y^ek3)=vlb3wag$2n}ejiyP
z6$IOwn(XHsgaB}|@Vl%N9_yLEHYNY}-1IT!zQjKM$x0~lNts+G7L10jvqhz1AHD~b
zFT;+z_-5?<XQN!I*DQ!xBH1*?W?yN67^uvxb}0LST!4~@qTJ!;35P!?J{$ZJ!v9DO
zE89R(%%4Q?urBVZBL;GU*@^MH*1X8|s62!#V@NOJhUteBIXzo$Y^;$1C%ctwT#hfB
zVfLX#&3~+Tw>T1$AsJRzy#J_3z;4MgY7Qhz3iLpg-Ld`O*O$k;Yxprym-8S-6w=fA
z8$U|Lfb3cPzP)x-s?vLdY_!kC^8)cBdWRJ3h&w2!EI23um}Qmq=kk11smkC%2VB>-
znwM<LQ3^}?q5iZnh<ak)jJ41|DniIAR_WwwynFcNE5x4xvh@AyUpOE}<moCch22Ed
zY_RRz6_d=W2Y3(`xO6v4RGQHb89}U5CMA`M#i9!=LP2j~2k-I7Az9=*DLhhI;%dk)
zW(3KtlgE)9x9aqnpxbExoeGjih3H<>yC*Vr2pYTDt?)kKK5*ZE|1Ghjf+4$1J{EBP
z_~-D4@N%A`;jG7Ocv%Ynu&ur&H5Cbx6FP`oaaEp#A6MjvQfT<mf-tzhYJV&dUoJk5
zwWid?Cs;WYWJ@JV68i-2qW&}+M}x+fHa_qYene8c^yDv;=kcXI{c^$NyN?nqb6yZR
z<2_0I&d$gu-nouMyTr=G3~Jn0BWbF`DrHgpSvpaJ05s;>qha~Cdnsn&K?-Mt$vUnr
zlxp{7#we*o)K^#lk~&-p+Q@#6l`J|)dCs7`9F{c>;KXBHC%j*xJRPXyL-98%*A?Y+
zZG1myz&n?C>?ZncIddt)D9ao{i0F!!pLp3m%|AmkO93`B#BtD)>?NpOPsHzyC%x$$
zCZ}j_j`hJqK&Iwk|MBf#F*bx6Kztzn;r=;(yohR&&v$4i)+)u~v76}^A$6L<1U_lz
zb<Ar^7A(5;Oz&Bg7lq|tLdB*Of9(|YQ4G13KRX}c{j&K-=wEpm%%c3?pZ}-J!63=V
t9`<^H%zy6%_`mA>{}-%n$**1kNu6I3>Ee9}|Gn%%R#Hi#=96*A{{!G76z>24

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_xmpp_black.png b/res/drawable-xxxhdpi/ic_xmpp_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..caf34e43f12e94bcc0489909ddc65ebb539195a9
GIT binary patch
literal 2239
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
AeE<Le

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_xmpp_grey.png b/res/drawable-xxxhdpi/ic_xmpp_grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4c6074c17f7efd285b9155ef45a82309e39492f
GIT binary patch
literal 2990
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
Dujq^V

literal 0
HcmV?d00001

diff --git a/res/layout/color_fragment.xml b/res/layout/color_fragment.xml
index d2ac52c54..7118c81fd 100644
--- a/res/layout/color_fragment.xml
+++ b/res/layout/color_fragment.xml
@@ -17,7 +17,7 @@
               android:paddingLeft="20dp"
               android:paddingRight="20dp"
               android:fontFamily="sans-serif-light"
-              tools:text="@string/IntroScreenActivity_welcome_to_smssecure"
+              tools:text="@string/IntroScreenActivity_welcome_to_silence"
               android:textColor="@android:color/white" />
 
     <ImageView android:id="@+id/watermark"
@@ -38,6 +38,7 @@
               android:id="@+id/subblurb"
               android:textSize="@dimen/onboarding_subtitle_size"
               android:textIsSelectable="false"
+              android:clickable="true"
               android:gravity="center_horizontal"
               android:layout_marginTop="20dp"
               android:paddingLeft="20dp"
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index f01aa5dd6..8dee3f27f 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -111,6 +111,19 @@
                           android:orientation="horizontal"
                           android:gravity="left">
 
+                <ImageView android:id="@+id/xmpp_indicator"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:paddingTop="2dp"
+                           android:paddingRight="4dp"
+                           android:paddingEnd="4dp"
+                           android:src="?conversation_item_xmpp"
+                           android:contentDescription="@string/conversation_item__xmpp_message_description"
+                           android:visibility="gone"
+                           android:tint="?conversation_item_received_text_secondary_color"
+                           android:tintMode="multiply"/>
+
                 <ImageView android:id="@+id/secure_indicator"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 17bb22357..9cbdfe7cd 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -153,6 +153,18 @@
                         android:layout_height="wrap_content"
                         app:iconColor="?conversation_item_sent_text_secondary_color"/>
 
+                <ImageView android:id="@+id/xmpp_indicator"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:src="?conversation_item_xmpp"
+                           android:visibility="gone"
+                           android:layout_gravity="center_vertical|end"
+                           android:paddingLeft="2dp"
+                           android:paddingBottom="3dp"
+                           android:tint="?conversation_item_sent_text_secondary_color"
+                           android:tintMode="multiply"
+                           android:contentDescription="@string/conversation_item__xmpp_message_description" />
+
                 <ImageView android:id="@+id/secure_indicator"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
diff --git a/res/layout/register_custom_xmpp_server.xml b/res/layout/register_custom_xmpp_server.xml
new file mode 100644
index 000000000..c69ab00e7
--- /dev/null
+++ b/res/layout/register_custom_xmpp_server.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true"
+            android:background="@drawable/background_pattern_repeat">
+
+  <LinearLayout android:padding="16dp"
+                android:paddingBottom="0dp"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+    <TextView style="@style/Registration.Description"
+              android:layout_width="fill_parent"
+              android:gravity="start"
+              android:layout_marginBottom="16dip"
+              android:text="@string/register_xmpp_account_it_is_highly_recommended_to_enable_stream_management" />
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText android:id="@+id/hostname"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:inputType="text"
+                  android:layout_marginBottom="10dip"
+                  android:hint="@string/register_xmpp_account_hostname"
+                  android:singleLine="true"/>
+
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <EditText android:id="@+id/port"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:inputType="number"
+                  android:hint="@string/register_xmpp_account_port"
+                  android:singleLine="true"/>
+
+    </android.support.design.widget.TextInputLayout>
+
+    <LinearLayout android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="16dip"
+                  android:layout_marginBottom="16dip"
+                  android:layout_gravity="right"
+                  android:orientation="horizontal">
+
+      <Button
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginRight="5dip"
+              android:layout_weight="1"
+              android:text="@string/register_xmpp_account_cancel"
+              android:id="@+id/cancel_button"
+              android:enabled="true" />
+
+      <Button
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginRight="5dip"
+              android:layout_weight="1"
+              android:text="@string/register_xmpp_account_connect"
+              android:id="@+id/connect_button"
+              android:enabled="true" />
+
+    </LinearLayout>
+  </LinearLayout>
+</ScrollView>
diff --git a/res/layout/register_xmpp_account.xml b/res/layout/register_xmpp_account.xml
new file mode 100644
index 000000000..b0ceda575
--- /dev/null
+++ b/res/layout/register_xmpp_account.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:fillViewport="true"
+            android:background="@drawable/background_pattern_repeat">
+
+  <LinearLayout android:padding="16dp"
+                android:paddingBottom="0dp"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+    <TextView style="@style/Registration.Description"
+              android:layout_width="fill_parent"
+              android:layout_marginBottom="16dip"
+              android:gravity="start"
+              android:text="@string/register_xmpp_account_description" />
+
+    <TextView style="@style/Registration.Description"
+              android:layout_width="fill_parent"
+              android:layout_marginBottom="16dip"
+              android:gravity="start"
+              android:text="@string/register_xmpp_account_warning" />
+
+    <TextView style="@style/Registration.Description"
+              android:layout_width="fill_parent"
+              android:gravity="start"
+              android:text="@string/register_xmpp_account_choose" />
+
+    <LinearLayout android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="16dip"
+                  android:layout_marginBottom="16dip"
+                  android:layout_gravity="right"
+                  android:orientation="horizontal">
+
+      <Button
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginRight="5dip"
+              android:layout_weight="1"
+              android:text="@string/register_xmpp_account_use_a_trusted_server"
+              android:id="@+id/trusted_server_button"
+              android:enabled="true" />
+
+      <Button
+              android:layout_width="0dp"
+              android:layout_height="wrap_content"
+              android:layout_marginRight="5dip"
+              android:layout_weight="1"
+              android:text="@string/register_xmpp_account_use_my_own_server"
+              android:id="@+id/custom_server_button"
+              android:enabled="true" />
+
+    </LinearLayout>
+
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/register_xmpp_account_cancel"
+            android:id="@+id/cancel_button"
+            android:enabled="true" />
+
+  </LinearLayout>
+</ScrollView>
diff --git a/res/layout/xmpp_address_dialog.xml b/res/layout/xmpp_address_dialog.xml
new file mode 100644
index 000000000..0e7e9edbb
--- /dev/null
+++ b/res/layout/xmpp_address_dialog.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <TextView android:id="@+id/xmpp_address"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:fontFamily="monospace"
+            android:text="(null)"
+            android:paddingTop="10dip"
+            android:gravity="center"
+            android:clickable="true" />
+
+  <TextView android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/xmpp_address_dialog__send_the_link_above_to_your_contacts_to_start_using_xmpp_messages_with_them"
+            android:gravity="center_vertical"
+            android:layout_below="@+id/xmpp_address"
+            android:padding="10dip" />
+
+</RelativeLayout>
diff --git a/res/layout/xmpp_enter_address_dialog.xml b/res/layout/xmpp_enter_address_dialog.xml
new file mode 100644
index 000000000..2211b94de
--- /dev/null
+++ b/res/layout/xmpp_enter_address_dialog.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <TextView android:id="@+id/xmpp_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/xmpp_enter_address_dialog__use_this_form_to_enter_the_xmpp_address_of"
+            android:gravity="center_vertical"
+            android:padding="10dip" />
+
+  <EditText android:id="@+id/xmpp_address"
+            android:layout_height="wrap_content"
+            android:hint="@string/xmpp_enter_address_dialog__xmpp_address"
+            android:inputType="textEmailAddress"
+            android:layout_below="@+id/xmpp_text"
+            android:layout_width="fill_parent">
+  </EditText>
+
+</RelativeLayout>
diff --git a/res/menu/conversation_secure_xmpp.xml b/res/menu/conversation_secure_xmpp.xml
new file mode 100644
index 000000000..64f160296
--- /dev/null
+++ b/res/menu/conversation_secure_xmpp.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+      <item android:title="@string/conversation_secure_verified__menu_share_xmpp_address"
+            android:id="@+id/menu_display_xmpp_address"/>
+      <item android:title="@string/conversation_secure_verified__menu_share_xmpp_address_via_sms"
+            android:id="@+id/menu_start_xmpp_exchange"/>
+      <item android:title="@string/conversation_secure_verified__menu_enter_xmpp_address_manually"
+            android:id="@+id/menu_enter_xmpp_address_manually"/>
+</menu>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index 26fd14565..87c12a734 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -4,11 +4,11 @@
     <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
     </style>
 
-    <style name="SMSSecureDialogPrimaryText">
+    <style name="SilenceDialogPrimaryText">
         <item name="android:textColor">?conversation_list_item_contact_color</item>
     </style>
 
-    <style name="SMSSecureDialogSecondaryText">
+    <style name="SilenceDialogSecondaryText">
         <item name="android:textColor">?conversation_list_item_date_color</item>
     </style>
 
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 36beecfcb..b4afafac3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -66,6 +66,7 @@
     <attr name="conversation_item_received_text_secondary_color" format="reference|color"/>
     <attr name="conversation_item_sent_text_indicator_tab_color" format="reference|color"/>
     <attr name="conversation_item_sent_indicator_text_background" format="reference" />
+    <attr name="conversation_item_xmpp" format="reference" />
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
@@ -112,6 +113,7 @@
     <attr name="pref_ic_appearance" format="reference" />
     <attr name="pref_ic_storage" format="reference" />
     <attr name="pref_ic_chats" format="reference" />
+    <attr name="pref_ic_xmpp" format="reference" />
     <attr name="pref_ic_advanced" format="reference" />
 
     <attr name="app_protect_timeout_picker_color" format="reference"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ce85dc422..1f688c8c9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -4,6 +4,8 @@
     <color name="silence_primary_dark">#ff1c7ac5</color>
     <color name="silence_primary_alpha33">#552090ea</color>
     <color name="silence_primary_alpha_focus">#882090ea</color>
+    <color name="silence_xmpp">#ff139f5b</color>
+    <color name="silence_xmpp_offline">#fff57f17</color>
 
     <color name="white">#ffffffff</color>
     <color name="black">#ff000000</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44d0c377f..b91317371 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,7 +83,7 @@
     <string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
     <string name="ConversationItem_from_s">from %s</string>
     <string name="ConversationItem_to_s">to %s</string>
-    <string name="ConversationItem_xmpp_address_update_silence">XMPP address. Update Silence to enable this feature.</string>
+    <string name="ConversationItem_xmpp_address">XMPP address</string>
 
     <!-- ConversationActivity -->
     <string name="ConversationActivity_initiate_secure_session_question">Initiate secure session?</string>
@@ -117,12 +117,14 @@
     <string name="ConversationActivity_transport_insecure_mms">Insecure MMS</string>
     <string name="ConversationActivity_transport_secure_sms">Secure SMS</string>
     <string name="ConversationActivity_transport_secure_mms">Secure MMS</string>
+    <string name="ConversationActivity_transport_secure_xmpp">XMPP</string>
     <string name="ConversationActivity_install_smssecure">Let\'s chat securely: %s</string>
     <string name="ConversationActivity_recipient_self">Secure sessions can only be established with other people.</string>
     <string name="ConversationActivity_mms_not_supported_title">MMS not supported</string>
     <string name="ConversationActivity_mms_not_supported_message">This message cannot be sent since your carrier doesn\'t support MMS.</string>
     <string name="ConversationActivity_specify_recipient">Please choose a contact</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Attachment exceeds size limits.</string>
+    <string name="ConversationActivity_recipient_is_offline_xmpp_messages_may_be_delayed">Recipient is offline. XMPP messages may be delayed.</string>
 
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
@@ -157,6 +159,7 @@
     <string name="ConversationFragment_pending">Pending...</string>
     <string name="ConversationFragment_mms">MMS</string>
     <string name="ConversationFragment_sms">SMS</string>
+    <string name="ConversationFragment_xmpp">XMPP</string>
     <string name="ConversationFragment_deleting">Deleting...</string>
     <string name="ConversationFragment_deleting_messages">Deleting messages...</string>
 
@@ -206,6 +209,8 @@
 
     <!-- ShareActivity -->
     <string name="ShareActivity_share_with">Share with</string>
+    <string name="ShareActivity_add_xmpp_address">Add XMPP address</string>
+    <string name="ShareActivity_xmpp_address_added">XMPP address added</string>
 
     <!-- IntroScreenActivity -->
     <string name="IntroScreenActivity_welcome_to_silence">Welcome to Silence!</string>
@@ -216,6 +221,9 @@
     <string name="IntroScreenActivity_talk_to_everyone_description">Silence can use unencrypted messages to chat with non-Silence users.</string>
     <string name="IntroScreenActivity_smssecure_is_now_silence">SMSSecure is now Silence.</string>
     <string name="IntroScreenActivity_your_messages_are_still_here">SMSSecure is now Silence. Your messages are still here and new features are coming.</string>
+    <string name="IntroScreenActivity_protect_your_metadata">Protect your metadata</string>
+    <string name="IntroScreenActivity_protect_your_metadata_description">You can optionally enable XMPP messages to protect your metadata.</string>
+    <string name="IntroScreenActivity_protect_your_metadata_link">Tap to configure XMPP messages</string>
 
     <!-- ExportFragment -->
     <string name="ExportFragment_export">Export</string>
@@ -429,6 +437,34 @@
     <string name="SingleRecipientNotificationBuilder_silence">Silence</string>
     <string name="SingleRecipientNotificationBuilder_new_message">New message</string>
 
+    <!-- XmppService -->
+    <string name="XmppService_cannot_reach_xmpp_server">Cannot reach XMPP server</string>
+    <string name="XmppService_xmpp_connection_failed">XMPP connection failed</string>
+    <string name="XmppService_xmpp_features_in_silence_are_disabled">XMPP features in Silence are disabled.</string>
+
+    <!-- XmppEnterAddressDialog -->
+    <string name="XmppEnterAddressDialog_done">Done!</string>
+
+    <!-- XmppAddressDialog -->
+    <string name="XmppAddressDialog_share_xmpp_address">Share XMPP address</string>
+    <string name="XmppAddressDialog_silence_xmpp_address">Silence XMPP address</string>
+    <string name="XmppAddressDialog_xmpp_address_copied">XMPP address copied!</string>
+    <string name="XmppAddressDialog_share">Share</string>
+    <string name="XmppAddressDialog_here_is_my_silence_xmpp_address">Here is my Silence XMPP address: %1$s. Enter it into Silence to start a secure conversation.</string>
+
+    <!-- XmppRegisterActivity -->
+    <string name="XmppRegisterActivity__cannot_create_an_xmpp_account_please_try_again_later">Cannot create an XMPP account. Please try again later.</string>
+    <string name="XmppRegisterActivity__registered">Registered!</string>
+    <string name="XmppRegisterActivity__unregistered">Unregistered!</string>
+    <string name="XmppRegisterActivity__you_are_already_registered">You are already registered!</string>
+
+    <!-- xmpp_enter_address_dialog -->
+    <string name="xmpp_enter_address_dialog__xmpp_address">XMPP address</string>
+    <string name="xmpp_enter_address_dialog__use_this_form_to_enter_the_xmpp_address_of">Use this form to enter the XMPP address of %s.</string>
+
+    <!-- xmpp_address_dialog -->
+    <string name="xmpp_address_dialog__send_the_link_above_to_your_contacts_to_start_using_xmpp_messages_with_them">Send the link above to your contacts to start using XMPP messages with them.</string>
+
     <!-- change_passphrase_activity -->
     <string name="change_passphrase_activity__old_passphrase">Old passphrase</string>
     <string name="change_passphrase_activity__new_passphrase">New passphrase</string>
@@ -461,6 +497,7 @@
     <string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string>
     <string name="conversation_activity__type_message_mms_secure">Send secure MMS</string>
     <string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string>
+    <string name="conversation_activity__type_message_xmpp_secure">Send secure XMPP message</string>
     <string name="conversation_activity__from_sim_name">From %1$s</string>
     <string name="conversation_activity__send">Send</string>
     <string name="conversation_activity__remove">Remove</string>
@@ -473,6 +510,7 @@
     <string name="conversation_item__mms_downloading_description">Media message downloading</string>
     <string name="conversation_item__mms_image_description">Media message</string>
     <string name="conversation_item__secure_message_description">Secure message</string>
+    <string name="conversation_item__xmpp_message_description">XMPP message</string>
 
     <!-- conversation_item_sent -->
     <string name="conversation_item_sent__download">Download</string>
@@ -582,6 +620,8 @@
     <string name="AndroidManifest__message_details">Message details</string>
     <string name="AndroidManifest_archived_conversations">Archived conversations</string>
     <string name="AndroidManifest_configure_mms_settings">Configure MMS Settings</string>
+    <string name="AndroidManifest__register">Register</string>
+    <string name="AndroidManifest__use_a_custom_xmpp_server">Use a custom XMPP server</string>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import / export</string>
@@ -720,6 +760,20 @@
     <string name="preferences__roaming_auto_retrieve">Roaming auto-retrieve</string>
     <string name="preferences__automatically_retrieve_mms_when_roaming">Automatically retrieve MMS when roaming</string>
     <string name="preferences_chats__message_trimming">Message trimming</string>
+    <string name="preferences__xmpp">XMPP messages</string>
+    <string name="preferences__enable_xmpp_messages">Enable XMPP messages</string>
+    <string name="preferences__xmpp_status">XMPP status</string>
+    <string name="preferences__xmpp_status_registered_connected">Registered, connected.</string>
+    <string name="preferences__xmpp_status_registered_disconnected">Registered, disconnected.</string>
+    <string name="preferences__xmpp_status_unregistered">Unregistered.</string>
+    <string name="preferences__xmpp_unregistering_xmpp">Unregistering XMPP?</string>
+    <string name="preferences__xmpp_unregistering_from_xmpp_will_delete_the_account_on_the_server">Unregistering from XMPP will delete your account on the server and notify every contact with an XMPP session using SMS messages.</string>
+    <string name="preferences__xmpp_notify">Notify contacts</string>
+    <string name="preferences__xmpp_notify_summary">Send an SMS message with my XMPP address to every contact with a secure session.</string>
+    <string name="preferences__xmpp_notifying">Notifying</string>
+    <string name="preferences__xmpp_sending_messages_to_contacts">Sending messages to contacts</string>
+    <string name="preferences__force_xmpp_messages">Force XMPP messages</string>
+    <string name="preferences__enable_this_option_to_always_use_xmpp_transport_even_if_recipient_is_offline">Enable this option to always use XMPP transport even if recipient is offline.</string>
 
     <!-- **************************************** -->
     <!-- menus -->
@@ -784,7 +838,10 @@
     <!-- conversation_secure_verified -->
     <string name="conversation_secure_verified__menu_security">Security</string>
     <string name="conversation_secure_verified__menu_verify_identity">Verify identity</string>
+    <string name="conversation_secure_verified__menu_share_xmpp_address">Share XMPP address</string>
+    <string name="conversation_secure_verified__menu_share_xmpp_address_via_sms">Share XMPP address via SMS</string>
     <string name="conversation_secure_verified__menu_abort_secure_session">End secure session</string>
+    <string name="conversation_secure_verified__menu_enter_xmpp_address_manually">Enter XMPP address manually</string>
 
     <!-- conversation_muted -->
     <string name="conversation_muted__unmute">Unmute</string>
@@ -862,6 +919,21 @@
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
 
+    <!-- register_xmpp_account -->
+    <string name="register_xmpp_account_description">You can enable XMPP messages in Silence to protect your metadata. Metadata (mostly to who you talk and when) is a sensitive information that cannot be hidden using SMS messages. XMPP messages use data so you need to be connected to the Internet to use this transport and receive messages.</string>
+    <string name="register_xmpp_account_warning">Remember: there is one metadata that you cannot hide. Your GSM carrier will always be able to locate your phone at any time.</string>
+    <string name="register_xmpp_account_choose">If you don\'t have an XMPP account, Silence will create one on a random trusted server. If you manage your own XMPP server, you can use it instead.</string>
+    <string name="register_xmpp_account_use_a_trusted_server">Use a trusted server</string>
+    <string name="register_xmpp_account_use_my_own_server">Use my own server</string>
+    <string name="register_xmpp_account_cancel">Cancel</string>
+    <string name="register_xmpp_account_registration">Registration</string>
+    <string name="register_xmpp_account_creating_an_xmpp_account">Creating an XMPP account...</string>
+    <string name="register_xmpp_account_hostname">Hostname</string>
+    <string name="register_xmpp_account_port">Port</string>
+    <string name="register_xmpp_account_connect">Connect</string>
+    <string name="register_xmpp_account_invalid_port">Invalid port.</string>
+    <string name="register_xmpp_account_cannot_register_on_this_server">Cannot register on this server.</string>
+    <string name="register_xmpp_account_it_is_highly_recommended_to_enable_stream_management">It is highly recommended to enable the Stream Management extension (XEP-0198) on your server. Stream Management allows Silence to resume connections. Without that, you may lost messages on unreliable connections.</string>
 
     <!-- EOF -->
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 44245334a..49e59dd3d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -140,6 +140,7 @@
         <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
         <item name="conversation_item_received_text_primary_color">@color/white</item>
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
+        <item name="conversation_item_xmpp">@drawable/ic_xmpp_white_18dp</item>
 
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
@@ -182,6 +183,7 @@
         <item name="pref_ic_app_protection">@drawable/ic_app_protection_black</item>
         <item name="pref_ic_appearance">@drawable/ic_brightness_6_black</item>
         <item name="pref_ic_chats">@drawable/ic_forum_black_32dp</item>
+        <item name="pref_ic_xmpp">@drawable/ic_xmpp_black</item>
         <item name="pref_ic_advanced">@drawable/ic_advanced_black</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
@@ -220,6 +222,7 @@
         <item name="conversation_item_received_text_primary_color">@color/white</item>
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
+        <item name="conversation_item_xmpp">@drawable/ic_xmpp_white_18dp</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
@@ -296,6 +299,7 @@
         <item name="pref_ic_app_protection">@drawable/ic_app_protection_gray</item>
         <item name="pref_ic_appearance">@drawable/ic_brightness_6_gray</item>
         <item name="pref_ic_chats">@drawable/ic_forum_grey_32dp</item>
+        <item name="pref_ic_xmpp">@drawable/ic_xmpp_grey</item>
         <item name="pref_ic_advanced">@drawable/ic_advanced_gray</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 1d6725759..f12ea8540 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -21,6 +21,10 @@
                 android:title="@string/preferences__chats"
                 android:icon="?pref_ic_chats"/>
 
+    <Preference android:key="preference_category_xmpp"
+                android:title="@string/preferences__xmpp"
+                android:icon="?pref_ic_xmpp"/>
+
     <Preference android:key="preference_category_advanced"
                 android:title="@string/preferences__advanced"
                 android:icon="?pref_ic_advanced"/>
diff --git a/res/xml/preferences_xmpp.xml b/res/xml/preferences_xmpp.xml
new file mode 100644
index 000000000..b50489546
--- /dev/null
+++ b/res/xml/preferences_xmpp.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="@string/preferences__xmpp">
+        <org.smssecure.smssecure.components.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_xmpp_enabled"
+            android:title="@string/preferences__enable_xmpp_messages" />
+
+        <Preference android:key="pref_xmpp_status"
+                    android:title="@string/preferences__xmpp_status"
+                    android:dependency="pref_xmpp_enabled" />
+
+        <org.smssecure.smssecure.components.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_xmpp_force"
+            android:title="@string/preferences__force_xmpp_messages"
+            android:summary="@string/preferences__enable_this_option_to_always_use_xmpp_transport_even_if_recipient_is_offline"
+            android:dependency="pref_xmpp_enabled" />
+
+        <Preference android:key="pref_xmpp_notify"
+                    android:title="@string/preferences__xmpp_notify"
+                    android:summary="@string/preferences__xmpp_notify_summary"
+                    android:dependency="pref_xmpp_enabled" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/provider_paths.xml b/res/xml/provider_paths.xml
new file mode 100644
index 000000000..4ff893110
--- /dev/null
+++ b/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>
diff --git a/src/org/smssecure/smssecure/ApplicationContext.java b/src/org/smssecure/smssecure/ApplicationContext.java
index f09736a3e..efa0278a8 100644
--- a/src/org/smssecure/smssecure/ApplicationContext.java
+++ b/src/org/smssecure/smssecure/ApplicationContext.java
@@ -18,6 +18,7 @@ package org.smssecure.smssecure;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.Intent;
 
 import org.smssecure.smssecure.crypto.PRNGFixes;
 import org.smssecure.smssecure.dependencies.InjectableType;
@@ -26,6 +27,8 @@ import org.smssecure.smssecure.jobs.requirements.MasterSecretRequirementProvider
 import org.smssecure.smssecure.jobs.requirements.MediaNetworkRequirementProvider;
 import org.smssecure.smssecure.jobs.requirements.ServiceRequirementProvider;
 import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.XmppUtil;
+import org.smssecure.smssecure.service.XmppService;
 import org.whispersystems.jobqueue.JobManager;
 import org.whispersystems.jobqueue.dependencies.DependencyInjector;
 import org.whispersystems.jobqueue.requirements.NetworkRequirementProvider;
@@ -60,6 +63,7 @@ public class ApplicationContext extends Application implements DependencyInjecto
     initializeRandomNumberFix();
     initializeLogging();
     initializeJobManager();
+    initializeXmppService();
   }
 
   @Override
@@ -94,6 +98,10 @@ public class ApplicationContext extends Application implements DependencyInjecto
                                 .build();
   }
 
+  private void initializeXmppService() {
+    XmppUtil.startService(this);
+  }
+
   public void notifyMediaControlEvent() {
     mediaNetworkRequirementProvider.notifyMediaControlEvent();
   }
diff --git a/src/org/smssecure/smssecure/ApplicationPreferencesActivity.java b/src/org/smssecure/smssecure/ApplicationPreferencesActivity.java
index 364b69201..29b5e396e 100644
--- a/src/org/smssecure/smssecure/ApplicationPreferencesActivity.java
+++ b/src/org/smssecure/smssecure/ApplicationPreferencesActivity.java
@@ -17,9 +17,11 @@
 package org.smssecure.smssecure;
 
 import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build.VERSION;
 import android.os.Bundle;
@@ -40,11 +42,12 @@ import org.smssecure.smssecure.preferences.AppearancePreferenceFragment;
 import org.smssecure.smssecure.preferences.NotificationsPreferenceFragment;
 import org.smssecure.smssecure.preferences.SmsMmsPreferenceFragment;
 import org.smssecure.smssecure.preferences.ChatsPreferenceFragment;
+import org.smssecure.smssecure.preferences.XmppPreferenceFragment;
 import org.smssecure.smssecure.service.KeyCachingService;
+import org.smssecure.smssecure.service.XmppService;
 import org.smssecure.smssecure.util.Dialogs;
 import org.smssecure.smssecure.util.DynamicLanguage;
 import org.smssecure.smssecure.util.DynamicTheme;
-import org.smssecure.smssecure.util.task.ProgressDialogAsyncTask;
 import org.smssecure.smssecure.util.ResUtil;
 import org.smssecure.smssecure.util.SilencePreferences;
 import org.whispersystems.libaxolotl.util.guava.Optional;
@@ -68,6 +71,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
   private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection";
   private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
   private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
+  private static final String PREFERENCE_CATEGORY_XMPP           = "preference_category_xmpp";
   private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
   private static final String PREFERENCE_ABOUT                   = "preference_about";
 
@@ -136,10 +140,21 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
   }
 
   public static class ApplicationPreferenceFragment extends PreferenceFragment {
+    private BroadcastReceiver xmppUpdateReceiver;
+
     @Override
     public void onCreate(Bundle icicle) {
       super.onCreate(icicle);
 
+      xmppUpdateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+          setCategorySummaries();
+        }
+      };
+
+      getActivity().registerReceiver(xmppUpdateReceiver, new IntentFilter(XmppService.XMPP_CONNECTIVITY_EVENT));
+
       addPreferencesFromResource(R.xml.preferences);
 
       MasterSecret masterSecret = getArguments().getParcelable("master_secret");
@@ -153,6 +168,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         .setOnPreferenceClickListener(new CategoryClickListener(masterSecret, PREFERENCE_CATEGORY_APPEARANCE));
       this.findPreference(PREFERENCE_CATEGORY_CHATS)
         .setOnPreferenceClickListener(new CategoryClickListener(masterSecret, PREFERENCE_CATEGORY_CHATS));
+      this.findPreference(PREFERENCE_CATEGORY_XMPP)
+        .setOnPreferenceClickListener(new CategoryClickListener(masterSecret, PREFERENCE_CATEGORY_XMPP));
       this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
         .setOnPreferenceClickListener(new CategoryClickListener(masterSecret, PREFERENCE_CATEGORY_ADVANCED));
     }
@@ -175,6 +192,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
           .setSummary(AppearancePreferenceFragment.getSummary(getActivity()));
       this.findPreference(PREFERENCE_CATEGORY_CHATS)
           .setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_XMPP)
+          .setSummary(XmppPreferenceFragment.getSummary(getActivity()));
 
       String version = String.format(this.getString(R.string.preferences__about_version),  BuildConfig.VERSION_NAME);
       String buildID = String.format(this.getString(R.string.preferences__about_build_id), BuildConfig.BUILD_GIT_COMMIT);
@@ -214,6 +233,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         case PREFERENCE_CATEGORY_CHATS:
           fragment = new ChatsPreferenceFragment();
           break;
+        case PREFERENCE_CATEGORY_XMPP:
+          fragment = new XmppPreferenceFragment();
+          break;
         case PREFERENCE_CATEGORY_ADVANCED:
           fragment = new AdvancedPreferenceFragment();
           break;
@@ -234,5 +256,12 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         return true;
       }
     }
+
+    @Override
+    public void onDestroy() {
+      super.onDestroy();
+      if (xmppUpdateReceiver != null) getActivity().unregisterReceiver(xmppUpdateReceiver);
+    }
+
   }
 }
diff --git a/src/org/smssecure/smssecure/BasicIntroFragment.java b/src/org/smssecure/smssecure/BasicIntroFragment.java
index 35e9e640b..8863827f7 100644
--- a/src/org/smssecure/smssecure/BasicIntroFragment.java
+++ b/src/org/smssecure/smssecure/BasicIntroFragment.java
@@ -1,7 +1,14 @@
 package org.smssecure.smssecure;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.text.method.LinkMovementMethod;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ClickableSpan;
+import android.text.TextPaint;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,20 +17,30 @@ import android.widget.TextView;
 
 public class BasicIntroFragment extends Fragment {
 
-  private static final String ARG_DRAWABLE = "drawable";
-  private static final String ARG_TEXT     = "text";
-  private static final String ARG_SUBTEXT  = "subtext";
+  private static final String TAG = BasicIntroFragment.class.getSimpleName();
 
-  private int drawable;
-  private int text;
-  private int subtext;
+  private static final String ARG_DRAWABLE  = "drawable";
+  private static final String ARG_TEXT      = "text";
+  private static final String ARG_SUBTEXT   = "subtext";
+  private static final String ARG_LINK_TEXT = "link_text";
+  private static final String ARG_ACTIVITY  = "activity";
 
-  public static BasicIntroFragment newInstance(int drawable, int text, int subtext) {
+  private int    drawable;
+  private int    text;
+  private int    subtext;
+  private int    linkText;
+  private String activity;
+
+  public static BasicIntroFragment newInstance(int drawable, int text, int subtext, int linkText, String activity) {
     BasicIntroFragment fragment = new BasicIntroFragment();
     Bundle args = new Bundle();
     args.putInt(ARG_DRAWABLE, drawable);
     args.putInt(ARG_TEXT, text);
     args.putInt(ARG_SUBTEXT, subtext);
+    args.putInt(ARG_LINK_TEXT, linkText);
+
+    args.putString(ARG_ACTIVITY, activity);
+
     fragment.setArguments(args);
     return fragment;
   }
@@ -34,9 +51,12 @@ public class BasicIntroFragment extends Fragment {
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     if (getArguments() != null) {
-      drawable = getArguments().getInt(ARG_DRAWABLE);
-      text     = getArguments().getInt(ARG_TEXT    );
-      subtext  = getArguments().getInt(ARG_SUBTEXT );
+      drawable = getArguments().getInt(ARG_DRAWABLE );
+      text     = getArguments().getInt(ARG_TEXT     );
+      subtext  = getArguments().getInt(ARG_SUBTEXT  );
+      linkText = getArguments().getInt(ARG_LINK_TEXT);
+
+      activity = getArguments().getString(ARG_ACTIVITY);
     }
   }
 
@@ -47,7 +67,35 @@ public class BasicIntroFragment extends Fragment {
 
     ((ImageView)v.findViewById(R.id.watermark)).setImageResource(drawable);
     ((TextView)v.findViewById(R.id.blurb)).setText(text);
-    ((TextView)v.findViewById(R.id.subblurb)).setText(subtext);
+
+    if (linkText != -1) {
+      TextView subBlurbView = (TextView) v.findViewById(R.id.subblurb);
+      SpannableString spannableString = new SpannableString(getString(subtext) + " " + getString(linkText));
+      ClickableSpan clickableSpan = new ClickableSpan() {
+        @Override
+        public void onClick(View widget) {
+          if (activity != null) {
+            try {
+              Intent intent = new Intent(getActivity(), Class.forName(activity));
+              getActivity().startActivity(intent);
+            } catch (ClassNotFoundException e) {
+              Log.w(TAG, e);
+            }
+          }
+        }
+
+        @Override
+        public void updateDrawState(TextPaint textPaint) {
+          textPaint.linkColor = getResources().getColor(org.smssecure.smssecure.R.color.white);
+          super.updateDrawState(textPaint);
+        }
+      };
+      spannableString.setSpan(clickableSpan, getString(subtext).length() + 1, spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      subBlurbView.setMovementMethod(LinkMovementMethod.getInstance());
+      subBlurbView.setText(spannableString);
+    } else {
+      ((TextView)v.findViewById(R.id.subblurb)).setText(subtext);
+    }
 
     return v;
   }
diff --git a/src/org/smssecure/smssecure/ConversationActivity.java b/src/org/smssecure/smssecure/ConversationActivity.java
index 01bac3a26..f1487491a 100644
--- a/src/org/smssecure/smssecure/ConversationActivity.java
+++ b/src/org/smssecure/smssecure/ConversationActivity.java
@@ -102,10 +102,12 @@ import org.smssecure.smssecure.recipients.RecipientFormattingException;
 import org.smssecure.smssecure.recipients.Recipients;
 import org.smssecure.smssecure.recipients.Recipients.RecipientsModifiedListener;
 import org.smssecure.smssecure.service.KeyCachingService;
+import org.smssecure.smssecure.service.XmppService;
 import org.smssecure.smssecure.sms.MessageSender;
 import org.smssecure.smssecure.sms.OutgoingEncryptedMessage;
 import org.smssecure.smssecure.sms.OutgoingEndSessionMessage;
 import org.smssecure.smssecure.sms.OutgoingTextMessage;
+import org.smssecure.smssecure.sms.OutgoingXmppExchangeMessage;
 import org.smssecure.smssecure.util.concurrent.AssertedSuccessListener;
 import org.smssecure.smssecure.util.CharacterCalculator.CharacterState;
 import org.smssecure.smssecure.util.Dialogs;
@@ -120,9 +122,12 @@ import org.smssecure.smssecure.util.ViewUtil;
 import org.smssecure.smssecure.util.concurrent.ListenableFuture;
 import org.smssecure.smssecure.util.concurrent.SettableFuture;
 import org.smssecure.smssecure.util.dualsim.SubscriptionManagerCompat;
+import org.smssecure.smssecure.util.XmppUtil;
 import org.whispersystems.libaxolotl.InvalidMessageException;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
+import org.jivesoftware.smack.packet.Presence;
+
 import java.io.IOException;
 import java.util.List;
 
@@ -174,6 +179,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   AttachmentTypeSelectorAdapter attachmentAdapter;
   private   AttachmentManager             attachmentManager;
   private   BroadcastReceiver             securityUpdateReceiver;
+  private   BroadcastReceiver             xmppUpdateReceiver;
   private   BroadcastReceiver             groupUpdateReceiver;
   private   EmojiDrawer                   emojiDrawer;
   private   EmojiToggle                   emojiToggle;
@@ -280,6 +286,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     saveDraft();
     if (recipients != null) recipients.removeListener(this);
     if (securityUpdateReceiver != null) unregisterReceiver(securityUpdateReceiver);
+    if (xmppUpdateReceiver != null) unregisterReceiver(xmppUpdateReceiver);
     if (groupUpdateReceiver != null) unregisterReceiver(groupUpdateReceiver);
     super.onDestroy();
   }
@@ -333,6 +340,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (isSingleConversation() && isEncryptedConversation) {
       inflater.inflate(R.menu.conversation_secure_identity, menu);
+      if (SilencePreferences.isXmppRegistered(this)) inflater.inflate(R.menu.conversation_secure_xmpp, menu.findItem(R.id.menu_security).getSubMenu());
       inflater.inflate(R.menu.conversation_secure_sms, menu.findItem(R.id.menu_security).getSubMenu());
     } else if (isSingleConversation()) {
       inflater.inflate(R.menu.conversation_insecure_no_push, menu);
@@ -374,23 +382,26 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);
     switch (item.getItemId()) {
-    case R.id.menu_call:                      handleDial(getRecipients().getPrimaryRecipient()); return true;
-    case R.id.menu_delete_conversation:       handleDeleteConversation();                        return true;
-    case R.id.menu_archive_conversation:      handleArchiveConversation();                       return true;
-    case R.id.menu_add_attachment:            handleAddAttachment();                             return true;
-    case R.id.menu_view_media:                handleViewMedia();                                 return true;
-    case R.id.menu_add_to_contacts:           handleAddToContacts();                             return true;
-    case R.id.menu_start_secure_session:      handleStartSecureSession();                        return true;
-    case R.id.menu_abort_session:             handleAbortSecureSession();                        return true;
-    case R.id.menu_verify_identity:           handleVerifyIdentity();                            return true;
-    case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
-    case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
-    case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
-    case R.id.menu_invite:                    handleInviteLink();                                return true;
-    case R.id.menu_mute_notifications:        handleMuteNotifications();                         return true;
-    case R.id.menu_unmute_notifications:      handleUnmuteNotifications();                       return true;
-    case R.id.menu_conversation_settings:     handleConversationSettings();                      return true;
-    case android.R.id.home:                   handleReturnToConversationList();                  return true;
+    case R.id.menu_call:                        handleDial(getRecipients().getPrimaryRecipient()); return true;
+    case R.id.menu_delete_conversation:         handleDeleteConversation();                        return true;
+    case R.id.menu_archive_conversation:        handleArchiveConversation();                       return true;
+    case R.id.menu_add_attachment:              handleAddAttachment();                             return true;
+    case R.id.menu_view_media:                  handleViewMedia();                                 return true;
+    case R.id.menu_add_to_contacts:             handleAddToContacts();                             return true;
+    case R.id.menu_start_secure_session:        handleStartSecureSession();                        return true;
+    case R.id.menu_display_xmpp_address:        handleDisplayXmppAddress();                        return true;
+    case R.id.menu_start_xmpp_exchange:         handleStartXmppExchange();                         return true;
+    case R.id.menu_enter_xmpp_address_manually: handleEnterXmppAddressManually();                  return true;
+    case R.id.menu_abort_session:               handleAbortSecureSession();                        return true;
+    case R.id.menu_verify_identity:             handleVerifyIdentity();                            return true;
+    case R.id.menu_group_recipients:            handleDisplayGroupRecipients();                    return true;
+    case R.id.menu_distribution_broadcast:      handleDistributionBroadcastEnabled(item);          return true;
+    case R.id.menu_distribution_conversation:   handleDistributionConversationEnabled(item);       return true;
+    case R.id.menu_invite:                      handleInviteLink();                                return true;
+    case R.id.menu_mute_notifications:          handleMuteNotifications();                         return true;
+    case R.id.menu_unmute_notifications:        handleUnmuteNotifications();                       return true;
+    case R.id.menu_conversation_settings:       handleConversationSettings();                      return true;
+    case android.R.id.home:                     handleReturnToConversationList();                  return true;
     }
 
     return false;
@@ -531,6 +542,59 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     builder.show();
   }
 
+  private void handleDisplayXmppAddress() {
+    new XmppAddressDialog(this).show();
+  }
+
+  private void handleStartXmppExchange() {
+    if (getRecipients() == null) {
+      Toast.makeText(this, getString(R.string.ConversationActivity_invalid_recipient),
+                     Toast.LENGTH_LONG).show();
+      return;
+    }
+
+    if (TelephonyUtil.isMyPhoneNumber(this, recipients.getPrimaryRecipient().getNumber())) {
+      Toast.makeText(this, getString(R.string.ConversationActivity_recipient_self),
+              Toast.LENGTH_LONG).show();
+      return;
+    }
+
+    final Recipients recipients = getRecipients();
+    final Recipient recipient   = recipients.getPrimaryRecipient();
+    final int subscriptionId    = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
+
+    OutgoingXmppExchangeMessage xmppExchangeMessage =
+        new OutgoingXmppExchangeMessage(new OutgoingTextMessage(getRecipients(),
+                                                                SilencePreferences.getXmppUsername(this) + "@" + SilencePreferences.getXmppHostname(this),
+                                                                subscriptionId));
+
+    final Context context = getApplicationContext();
+
+    new AsyncTask<OutgoingXmppExchangeMessage, Void, Long>() {
+      @Override
+      protected Long doInBackground(OutgoingXmppExchangeMessage... messages) {
+        return MessageSender.send(context, masterSecret, messages[0], threadId, false);
+      }
+
+      @Override
+      protected void onPostExecute(Long threadId) {
+        long allocatedThreadId;
+        if (threadId == -1) {
+          allocatedThreadId = DatabaseFactory.getThreadDatabase(getApplicationContext()).getThreadIdFor(recipients);
+        } else {
+          allocatedThreadId = threadId;
+        }
+        Log.w(TAG, "Refreshing thread "+allocatedThreadId+"...");
+        sendComplete(allocatedThreadId);
+      }
+    }.execute(xmppExchangeMessage);
+  }
+
+  private void handleEnterXmppAddressManually() {
+    Recipient recipient = recipients.getPrimaryRecipient();
+    if (recipient != null) new XmppEnterAddressDialog(this, recipient).show();
+  }
+
   private void handleAbortSecureSession() {
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setTitle(R.string.ConversationActivity_abort_secure_session_confirmation);
@@ -750,11 +814,29 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
 
     sendButton.resetAvailableTransports(isMediaMessage);
-    if (!isSecureSmsDestination      ) sendButton.disableTransport(Type.SECURE_SMS);
+    if (!isSecureSmsDestination){
+      sendButton.disableTransport(Type.SECURE_SMS);
+      sendButton.disableTransport(Type.SECURE_XMPP);
+      sendButton.disableTransport(Type.SECURE_XMPP_OFFLINE);
+    }
     if (recipients.isGroupRecipient()) sendButton.disableTransport(Type.INSECURE_SMS);
 
     if (isSecureSmsDestination) {
-      sendButton.setDefaultTransport(Type.SECURE_SMS);
+      if (primaryRecipient.getXmppJid() != null && XmppUtil.isXmppAvailable(this)) {
+        Presence presence = XmppService.getInstance().getRecipientPresence(primaryRecipient.getXmppJid());
+        if (presence == null ||
+           !presence.isAvailable()) {
+          sendButton.setDefaultTransport(SilencePreferences.isXmppForced(this) ? Type.SECURE_XMPP_OFFLINE : Type.SECURE_SMS);
+          sendButton.disableTransport(Type.SECURE_XMPP);
+        } else {
+          sendButton.setDefaultTransport(Type.SECURE_XMPP);
+          sendButton.disableTransport(Type.SECURE_XMPP_OFFLINE);
+        }
+      } else {
+        sendButton.setDefaultTransport(Type.SECURE_SMS);
+        sendButton.disableTransport(Type.SECURE_XMPP);
+        sendButton.disableTransport(Type.SECURE_XMPP_OFFLINE);
+      }
     } else {
       sendButton.setDefaultTransport(Type.INSECURE_SMS);
     }
@@ -841,6 +923,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     sendButton.addOnTransportChangedListener(new OnTransportChangedListener() {
       @Override
       public void onChange(TransportOption newTransport, boolean manuallySelected) {
+        if (newTransport.getType() == Type.SECURE_XMPP_OFFLINE && !SilencePreferences.isXmppForced(ConversationActivity.this)) {
+          Toast.makeText(ConversationActivity.this,
+                         R.string.ConversationActivity_recipient_is_offline_xmpp_messages_may_be_delayed,
+                         Toast.LENGTH_LONG).show();
+        }
         calculateCharactersRemaining();
         composeText.setTransport(newTransport);
         buttonToggle.getBackground().setColorFilter(newTransport.getBackgroundColor(), Mode.MULTIPLY);
@@ -906,6 +993,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         setBlockedUserState(recipients);
         setActionBarColor(recipients.getColor());
         updateRecipientPreferences();
+        initializeSecurity();
       }
     });
   }
@@ -917,13 +1005,22 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         long eventThreadId = intent.getLongExtra("thread_id", -1);
 
         if (eventThreadId == threadId || eventThreadId == -2) {
-          initializeSecurity();
           updateRecipientPreferences();
+          initializeSecurity();
           calculateCharactersRemaining();
         }
       }
     };
 
+    xmppUpdateReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        initializeSecurity();
+        updateRecipientPreferences();
+        calculateCharactersRemaining();
+      }
+    };
+
     groupUpdateReceiver = new BroadcastReceiver() {
       @Override
       public void onReceive(Context context, Intent intent) {
@@ -942,6 +1039,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                      new IntentFilter(SecurityEvent.SECURITY_UPDATE_EVENT),
                      KeyCachingService.KEY_PERMISSION, null);
 
+    registerReceiver(xmppUpdateReceiver,
+                    new IntentFilter(XmppService.XMPP_CONNECTIVITY_EVENT));
+
     registerReceiver(groupUpdateReceiver,
                      new IntentFilter(GroupDatabase.DATABASE_UPDATE_ACTION));
   }
@@ -1230,7 +1330,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     new AsyncTask<OutgoingMediaMessage, Void, Long>() {
       @Override
       protected Long doInBackground(OutgoingMediaMessage... messages) {
-        return MessageSender.send(context, masterSecret, messages[0], threadId, true);
+        boolean isXmpp = isXmppType(sendButton.getSelectedTransport().getType());
+        return MessageSender.send(context, masterSecret, messages[0], threadId, isXmpp);
       }
 
       @Override
@@ -1257,7 +1358,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     new AsyncTask<OutgoingTextMessage, Void, Long>() {
       @Override
       protected Long doInBackground(OutgoingTextMessage... messages) {
-        return MessageSender.send(context, masterSecret, messages[0], threadId, true);
+        boolean isXmpp = isXmppType(sendButton.getSelectedTransport().getType());
+        return MessageSender.send(context, masterSecret, messages[0], threadId, isXmpp);
       }
 
       @Override
@@ -1267,6 +1369,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }.execute(message);
   }
 
+  private boolean isXmppType(Type type) {
+    return type == Type.SECURE_XMPP || type == Type.SECURE_XMPP_OFFLINE;
+  }
+
   private void updateToggleButtonState() {
     if (composeText.getText().length() == 0 && !attachmentManager.isAttachmentPresent()) {
       buttonToggle.display(attachButton);
diff --git a/src/org/smssecure/smssecure/ConversationItem.java b/src/org/smssecure/smssecure/ConversationItem.java
index 4fb367909..faa20cf9a 100644
--- a/src/org/smssecure/smssecure/ConversationItem.java
+++ b/src/org/smssecure/smssecure/ConversationItem.java
@@ -99,6 +99,7 @@ public class ConversationItem extends LinearLayout
   private TextView           indicatorText;
   private TextView           groupStatusText;
   private ImageView          secureImage;
+  private ImageView          xmppImage;
   private AvatarImageView    contactPhoto;
   private DeliveryStatusView deliveryStatusIndicator;
   private AlertView          alertView;
@@ -142,6 +143,7 @@ public class ConversationItem extends LinearLayout
     this.indicatorText           = (TextView)           findViewById(R.id.indicator_text);
     this.groupStatusText         = (TextView)           findViewById(R.id.group_message_status);
     this.secureImage             = (ImageView)          findViewById(R.id.secure_indicator);
+    this.xmppImage               = (ImageView)          findViewById(R.id.xmpp_indicator);
     this.deliveryStatusIndicator = (DeliveryStatusView) findViewById(R.id.delivery_status);
     this.alertView               = (AlertView)          findViewById(R.id.indicators_parent);
     this.mmsDownloadButton       = (Button)             findViewById(R.id.mms_download_button);
@@ -311,6 +313,7 @@ public class ConversationItem extends LinearLayout
     indicatorText.setVisibility(View.GONE);
 
     secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
+    xmppImage.setVisibility(messageRecord.isXmpp() ? View.VISIBLE : View.GONE);
     bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
 
     dateText.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp()));
@@ -603,74 +606,8 @@ public class ConversationItem extends LinearLayout
                  !messageRecord.isStaleKeyExchange())
       {
         handleKeyExchangeClicked();
-      } else if (messageRecord.isPendingSmsFallback()) {
-        handleMessageApproval();
       }
     }
   }
 
-  private void handleMessageApproval() {
-    final int title;
-    final int message;
-
-    if (messageRecord.isPendingSecureSmsFallback()) {
-      //TODO: Remove push code
-      title = -1;
-
-      message = -1;
-    } else {
-      if (messageRecord.isMms()) title = R.string.ConversationItem_click_to_approve_unencrypted_mms_dialog_title;
-      else                       title = R.string.ConversationItem_click_to_approve_unencrypted_sms_dialog_title;
-
-      message = R.string.ConversationItem_click_to_approve_unencrypted_dialog_message;
-    }
-
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(title);
-
-    if (message > -1) builder.setMessage(message);
-
-    builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialogInterface, int i) {
-        if (messageRecord.isMms()) {
-          MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
-          if (messageRecord.isPendingInsecureSmsFallback()) {
-            database.markAsInsecure(messageRecord.getId());
-          }
-          database.markAsOutbox(messageRecord.getId());
-          database.markAsForcedSms(messageRecord.getId());
-
-          ApplicationContext.getInstance(context)
-                            .getJobManager()
-                            .add(new MmsSendJob(context, messageRecord.getId()));
-        } else {
-          SmsDatabase database = DatabaseFactory.getSmsDatabase(context);
-          if (messageRecord.isPendingInsecureSmsFallback()) {
-            database.markAsInsecure(messageRecord.getId());
-          }
-          database.markAsOutbox(messageRecord.getId());
-          database.markAsForcedSms(messageRecord.getId());
-
-          ApplicationContext.getInstance(context)
-                            .getJobManager()
-                            .add(new SmsSendJob(context, messageRecord.getId(),
-                                                messageRecord.getIndividualRecipient().getNumber()));
-        }
-      }
-    });
-
-    builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialogInterface, int i) {
-        if (messageRecord.isMms()) {
-          DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageRecord.getId());
-        } else {
-          DatabaseFactory.getSmsDatabase(context).markAsSentFailed(messageRecord.getId());
-        }
-      }
-    });
-    builder.show();
-  }
-
 }
diff --git a/src/org/smssecure/smssecure/ConversationListFragment.java b/src/org/smssecure/smssecure/ConversationListFragment.java
index 45e7e2fa0..9c2d70ae9 100644
--- a/src/org/smssecure/smssecure/ConversationListFragment.java
+++ b/src/org/smssecure/smssecure/ConversationListFragment.java
@@ -17,9 +17,11 @@
 package org.smssecure.smssecure;
 
 import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -63,6 +65,7 @@ import org.smssecure.smssecure.components.reminder.Reminder;
 import org.smssecure.smssecure.components.reminder.ReminderView;
 import org.smssecure.smssecure.components.reminder.StoreRatingReminder;
 import org.smssecure.smssecure.components.reminder.SystemSmsImportReminder;
+import org.smssecure.smssecure.components.reminder.XmppConnectivityDisconnectedReminder;
 import org.smssecure.smssecure.crypto.MasterCipher;
 import org.smssecure.smssecure.crypto.MasterSecret;
 import org.smssecure.smssecure.crypto.SessionUtil;
@@ -75,6 +78,7 @@ import org.smssecure.smssecure.notifications.MessageNotifier;
 import org.smssecure.smssecure.mms.OutgoingMediaMessage;
 import org.smssecure.smssecure.mms.OutgoingSecureMediaMessage;
 import org.smssecure.smssecure.recipients.Recipients;
+import org.smssecure.smssecure.service.XmppService;
 import org.smssecure.smssecure.sms.MessageSender;
 import org.smssecure.smssecure.sms.OutgoingEncryptedMessage;
 import org.smssecure.smssecure.sms.OutgoingTextMessage;
@@ -106,6 +110,8 @@ public class ConversationListFragment extends Fragment
   private String               queryFilter  = "";
   private boolean              archive;
 
+  private BroadcastReceiver    xmppUpdateReceiver;
+
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
@@ -151,6 +157,7 @@ public class ConversationListFragment extends Fragment
     super.onResume();
 
     initializeReminders();
+    initializeReceiver();
     list.getAdapter().notifyDataSetChanged();
   }
 
@@ -181,7 +188,9 @@ public class ConversationListFragment extends Fragment
         } else if (DeliveryReportsReminder.isEligible(context)) {
           return Optional.of((new DeliveryReportsReminder(context)));
         } else if (StoreRatingReminder.isEligible(context)) {
-          return Optional.of((new StoreRatingReminder(context)));
+          return Optional.of(new StoreRatingReminder(context));
+        } else if (XmppConnectivityDisconnectedReminder.isEligible(context)) {
+          return Optional.of(new XmppConnectivityDisconnectedReminder(context));
         } else {
           return Optional.absent();
         }
@@ -195,6 +204,17 @@ public class ConversationListFragment extends Fragment
     }.execute(getActivity());
   }
 
+  private void initializeReceiver() {
+    xmppUpdateReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        initializeReminders();
+      }
+    };
+
+    getActivity().registerReceiver(xmppUpdateReceiver, new IntentFilter(XmppService.XMPP_CONNECTIVITY_EVENT));
+  }
+
   private void initializeListAdapter() {
     list.setAdapter(new ConversationListAdapter(getActivity(), masterSecret, locale, null, this));
     getLoaderManager().restartLoader(0, null, this);
@@ -527,6 +547,12 @@ public class ConversationListFragment extends Fragment
     actionMode = null;
   }
 
+  @Override
+  public void onPause() {
+    super.onPause();
+    if (xmppUpdateReceiver != null) getActivity().unregisterReceiver(xmppUpdateReceiver);
+  }
+
   private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback {
 
     public ArchiveListenerCallback() {
diff --git a/src/org/smssecure/smssecure/IntroScreenActivity.java b/src/org/smssecure/smssecure/IntroScreenActivity.java
index c5dd8bb2f..6432a8249 100644
--- a/src/org/smssecure/smssecure/IntroScreenActivity.java
+++ b/src/org/smssecure/smssecure/IntroScreenActivity.java
@@ -45,15 +45,27 @@ public class IntroScreenActivity extends BaseActionBarActivity {
         add(new IntroPage(0xFF7568AE,
                           BasicIntroFragment.newInstance(R.drawable.splash_logo,
                                                          R.string.IntroScreenActivity_welcome_to_silence,
-                                                         R.string.IntroScreenActivity_silence_description)));
+                                                         R.string.IntroScreenActivity_silence_description,
+                                                         -1,
+                                                         null)));
         add(new IntroPage(0xFF7568AE,
                           BasicIntroFragment.newInstance(R.drawable.splash_padlock,
                                                          R.string.IntroScreenActivity_encrypt_your_messages,
-                                                         R.string.IntroScreenActivity_encrypt_your_messages_description)));
+                                                         R.string.IntroScreenActivity_encrypt_your_messages_description,
+                                                         -1,
+                                                         null)));
         add(new IntroPage(0xFF7568AE,
-                         BasicIntroFragment.newInstance(R.drawable.splash_open_padlock,
-                                                        R.string.IntroScreenActivity_talk_to_everyone,
-                                                        R.string.IntroScreenActivity_talk_to_everyone_description)));
+                          BasicIntroFragment.newInstance(R.drawable.splash_open_padlock,
+                                                         R.string.IntroScreenActivity_talk_to_everyone,
+                                                         R.string.IntroScreenActivity_talk_to_everyone_description,
+                                                         -1,
+                                                         null)));
+        add(new IntroPage(0xFF7568AE,
+                          BasicIntroFragment.newInstance(R.drawable.splash_xmpp,
+                                                         R.string.IntroScreenActivity_protect_your_metadata,
+                                                         R.string.IntroScreenActivity_protect_your_metadata_description,
+                                                         R.string.IntroScreenActivity_protect_your_metadata_link,
+                                                         "org.smssecure.smssecure.XmppRegisterActivity")));
       }
     });
 
@@ -98,7 +110,7 @@ public class IntroScreenActivity extends BaseActionBarActivity {
     if (numberOfPages > 1) {
       try {
         // For some reason this seems to throw an NPE on Android 2.3 - work around it for now
-        // See https://github.com/Silence/Silence/issues/311
+        // See https://github.com/SilenceIM/Silence/issues/311
         indicator.setViewPager(pager);
         indicator.setOnPageChangeListener(new OnPageChangeListener(introScreen.get()));
       }
diff --git a/src/org/smssecure/smssecure/MessageDetailsActivity.java b/src/org/smssecure/smssecure/MessageDetailsActivity.java
index 8c74d8d8d..6230ee651 100644
--- a/src/org/smssecure/smssecure/MessageDetailsActivity.java
+++ b/src/org/smssecure/smssecure/MessageDetailsActivity.java
@@ -173,6 +173,8 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
       transportText = "-";
     } else if (messageRecord.isPending()) {
       transportText = getString(R.string.ConversationFragment_pending);
+    } else if (messageRecord.isXmpp()) {
+      transportText = getString(R.string.ConversationFragment_xmpp);
     } else if (messageRecord.isMms()) {
       transportText = getString(R.string.ConversationFragment_mms);
     } else {
@@ -216,7 +218,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
 
   private void updateRecipients(MessageRecord messageRecord, Recipients recipients) {
     final int toFromRes;
-    if (messageRecord.isMms() && !messageRecord.isPush() && !messageRecord.isOutgoing()) {
+    if (messageRecord.isMms() && !messageRecord.isOutgoing()) {
       toFromRes = R.string.message_details_header__with;
     } else if (messageRecord.isOutgoing()) {
       toFromRes = R.string.message_details_header__to;
diff --git a/src/org/smssecure/smssecure/ShareActivity.java b/src/org/smssecure/smssecure/ShareActivity.java
index 8d9839523..d8e6c0898 100644
--- a/src/org/smssecure/smssecure/ShareActivity.java
+++ b/src/org/smssecure/smssecure/ShareActivity.java
@@ -30,6 +30,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import org.smssecure.smssecure.crypto.MasterSecret;
 import org.smssecure.smssecure.mms.PartAuthority;
@@ -62,6 +63,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   private Uri          resolvedExtra;
   private String       mimeType;
   private boolean      isPassingAlongMedia;
+  private String       xmppAddress;
 
   @Override
   protected void onPreCreate() {
@@ -79,6 +81,8 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
     initFragment(R.id.drawer_layout, new ShareFragment(), masterSecret);
     initializeMedia();
+    Uri xmppUri = getIntent().getData();
+    if (xmppUri != null) xmppAddress = xmppUri.getEncodedFragment();
   }
 
   @Override
@@ -93,7 +97,11 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
-    getSupportActionBar().setTitle(R.string.ShareActivity_share_with);
+    if (xmppAddress != null && !xmppAddress.equals("")) {
+      getSupportActionBar().setTitle(R.string.ShareActivity_add_xmpp_address);
+    } else {
+      getSupportActionBar().setTitle(R.string.ShareActivity_share_with);
+    }
   }
 
   @Override
@@ -157,6 +165,11 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void createConversation(long threadId, Recipients recipients, int distributionType) {
+    if (xmppAddress != null && !xmppAddress.equals("")) {
+      recipients.getPrimaryRecipient().setXmppJid(xmppAddress);
+      Toast.makeText(getApplicationContext(), R.string.ShareActivity_xmpp_address_added, Toast.LENGTH_LONG).show();
+    }
+
     final Intent intent = getBaseShareIntent(ConversationActivity.class);
     intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
@@ -216,4 +229,4 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
       ViewUtil.fadeOut(progressWheel, 300);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/org/smssecure/smssecure/TransportOption.java b/src/org/smssecure/smssecure/TransportOption.java
index 594b8177a..7a3d59b1b 100644
--- a/src/org/smssecure/smssecure/TransportOption.java
+++ b/src/org/smssecure/smssecure/TransportOption.java
@@ -13,7 +13,9 @@ public class TransportOption {
 
   public enum Type {
     INSECURE_SMS,
-    SECURE_SMS
+    SECURE_SMS,
+    SECURE_XMPP,
+    SECURE_XMPP_OFFLINE
   }
 
   private final int                             drawable;
diff --git a/src/org/smssecure/smssecure/TransportOptions.java b/src/org/smssecure/smssecure/TransportOptions.java
index 5de94f57b..46b9f7897 100644
--- a/src/org/smssecure/smssecure/TransportOptions.java
+++ b/src/org/smssecure/smssecure/TransportOptions.java
@@ -11,6 +11,8 @@ import org.smssecure.smssecure.util.SmsCharacterCalculator;
 import org.smssecure.smssecure.util.EncryptedSmsCharacterCalculator;
 import org.smssecure.smssecure.util.dualsim.SubscriptionInfoCompat;
 import org.smssecure.smssecure.util.dualsim.SubscriptionManagerCompat;
+import org.smssecure.smssecure.util.XmppUtil;
+import org.smssecure.smssecure.util.XmppCharacterCalculator;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
 import java.util.LinkedList;
@@ -146,6 +148,19 @@ public class TransportOptions {
                                                     new EncryptedSmsCharacterCalculator()));
     }
 
+    if (XmppUtil.isXmppAvailable(context)){
+      results.addAll(getTransportOptionsForSimCards(Type.SECURE_XMPP, R.drawable.ic_send_secure_white_24dp,
+                                                    context.getResources().getColor(R.color.silence_xmpp),
+                                                    context.getString(R.string.ConversationActivity_transport_secure_xmpp),
+                                                    context.getString(R.string.conversation_activity__type_message_xmpp_secure),
+                                                    new XmppCharacterCalculator()));
+      results.addAll(getTransportOptionsForSimCards(Type.SECURE_XMPP_OFFLINE, R.drawable.ic_send_secure_white_24dp,
+                                                    context.getResources().getColor(R.color.silence_xmpp_offline),
+                                                    context.getString(R.string.ConversationActivity_transport_secure_xmpp),
+                                                    context.getString(R.string.conversation_activity__type_message_xmpp_secure),
+                                                    new XmppCharacterCalculator()));
+    }
+
     return results;
   }
 
diff --git a/src/org/smssecure/smssecure/XmppAddressDialog.java b/src/org/smssecure/smssecure/XmppAddressDialog.java
new file mode 100644
index 000000000..8a689c015
--- /dev/null
+++ b/src/org/smssecure/smssecure/XmppAddressDialog.java
@@ -0,0 +1,86 @@
+package org.smssecure.smssecure;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.ServiceUtil;
+
+import java.io.IOException;
+
+/**
+ * Activity for displaying XMPP address.
+ */
+
+public class XmppAddressDialog extends AlertDialog {
+  private static final String TAG = XmppAddressDialog.class.getSimpleName();
+
+  public static final String TEXT_PLAIN = "text/plain";
+
+  private Context context;
+  private String  silenceLink;
+
+  public XmppAddressDialog(@NonNull Context context) {
+    super(context);
+
+    this.context = context;
+
+    LayoutInflater layoutInflater = ((Activity)context).getLayoutInflater();
+    View view = layoutInflater.inflate(R.layout.xmpp_address_dialog, null);
+
+    setTitle(context.getString(R.string.XmppAddressDialog_share_xmpp_address));
+    silenceLink = "https://s.silence.im/#" + SilencePreferences.getXmppJid(context);
+
+    TextView xmppAddress = (TextView) view.findViewById(R.id.xmpp_address);
+    xmppAddress.setText(silenceLink);
+    xmppAddress.setOnClickListener(new CopyXmppAdressListener());
+
+    setView(view);
+    setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(android.R.string.ok), new DialogInterface.OnClickListener() {
+      public void onClick(DialogInterface dialog, int which) {}
+    });
+    setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.XmppAddressDialog_share), new DialogInterface.OnClickListener() {
+      public void onClick(DialogInterface dialog, int which) {
+        shareXmppAddress();
+      }
+    });
+  }
+
+  private void shareXmppAddress() {
+    Intent sendIntent = new Intent();
+    sendIntent.setAction(Intent.ACTION_SEND);
+    sendIntent.putExtra(Intent.EXTRA_TEXT, context.getString(R.string.XmppAddressDialog_here_is_my_silence_xmpp_address, silenceLink));
+    sendIntent.setType(TEXT_PLAIN);
+    context.startActivity(sendIntent);
+  }
+
+  @Override
+  public void show() {
+    super.show();
+  }
+
+  private class CopyXmppAdressListener implements View.OnClickListener {
+    @Override
+    public void onClick(View view) {
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+        ServiceUtil.getClipboardManager(context).setText(silenceLink);
+      } else {
+        ClipData clipData = ClipData.newPlainText(context.getString(R.string.XmppAddressDialog_silence_xmpp_address), silenceLink);
+        ServiceUtil.getClipboardManager(context).setPrimaryClip(clipData);
+      }
+      Toast.makeText(context.getApplicationContext(),
+                     context.getString(R.string.XmppAddressDialog_xmpp_address_copied),
+                     Toast.LENGTH_LONG).show();
+    }
+  }
+}
diff --git a/src/org/smssecure/smssecure/XmppEnterAddressDialog.java b/src/org/smssecure/smssecure/XmppEnterAddressDialog.java
new file mode 100644
index 000000000..ad7ab916f
--- /dev/null
+++ b/src/org/smssecure/smssecure/XmppEnterAddressDialog.java
@@ -0,0 +1,63 @@
+package org.smssecure.smssecure;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.smssecure.smssecure.recipients.Recipient;
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.ServiceUtil;
+
+import java.io.IOException;
+
+/**
+ * Activity for entering XMPP address manually.
+ */
+
+public class XmppEnterAddressDialog extends AlertDialog {
+  private static final String TAG = XmppEnterAddressDialog.class.getSimpleName();
+
+  private Recipient recipient;
+  private View      view;
+  private Context   context;
+
+  public XmppEnterAddressDialog(@NonNull Context context, @NonNull Recipient recipient) {
+    super(context);
+    this.context   = context;
+    this.recipient = recipient;
+
+    LayoutInflater layoutInflater = ((Activity)context).getLayoutInflater();
+
+    view = layoutInflater.inflate(R.layout.xmpp_enter_address_dialog, null);
+
+    TextView xmppText = (TextView) view.findViewById(R.id.xmpp_text);
+
+    xmppText.setText(context.getString(R.string.xmpp_enter_address_dialog__use_this_form_to_enter_the_xmpp_address_of, recipient.getName()));
+
+    setView(view);
+    setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(android.R.string.cancel), (OnClickListener) null);
+    setButton(AlertDialog.BUTTON_POSITIVE, context.getString(android.R.string.ok), new EnterXmppAdressListener());
+  }
+
+  @Override
+  public void show() {
+    super.show();
+  }
+
+  private class EnterXmppAdressListener implements AlertDialog.OnClickListener {
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+      TextView xmppAddress = (TextView) view.findViewById(R.id.xmpp_address);
+      if (xmppAddress != null) recipient.setXmppJid(xmppAddress.getText() == null ? null : xmppAddress.getText().toString());
+      Toast.makeText(context,
+                     context.getString(R.string.XmppEnterAddressDialog_done),
+                     Toast.LENGTH_LONG).show();
+    }
+  }
+}
diff --git a/src/org/smssecure/smssecure/XmppRegisterActivity.java b/src/org/smssecure/smssecure/XmppRegisterActivity.java
new file mode 100644
index 000000000..c118f7a1a
--- /dev/null
+++ b/src/org/smssecure/smssecure/XmppRegisterActivity.java
@@ -0,0 +1,171 @@
+package org.smssecure.smssecure;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Looper;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.Toast;
+
+import org.smssecure.smssecure.util.DynamicLanguage;
+import org.smssecure.smssecure.util.DynamicTheme;
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.task.ProgressDialogAsyncTask;
+import org.smssecure.smssecure.util.XmppUtil;
+import org.smssecure.smssecure.XmppRegisterCustomActivity;
+
+/**
+ * Activity for registering an XMPP account on one of the trusted servers in
+ * Silence or on a custom server.
+ */
+public class XmppRegisterActivity extends BaseActionBarActivity {
+  private static final String TAG = XmppRegisterActivity.class.getSimpleName();
+
+  private Context context;
+
+  private static final int REGISTERING_CUSTOM_ACTIVITY_RESULT_CODE = 667;
+
+  private DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private Button trustedServerButton;
+  private Button customServerButton;
+  private Button cancelButton;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+    super.onCreate(savedInstanceState);
+
+    this.context = XmppRegisterActivity.this;
+
+    if (SilencePreferences.isXmppRegistered(context)) {
+      Toast.makeText(context, R.string.XmppRegisterActivity__you_are_already_registered, Toast.LENGTH_LONG).show();
+      finishActivity();
+    }
+
+    setContentView(R.layout.register_xmpp_account);
+
+    initializeResources();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  private void initializeResources() {
+    this.trustedServerButton = (Button) findViewById(R.id.trusted_server_button);
+    this.customServerButton  = (Button) findViewById(R.id.custom_server_button);
+    this.cancelButton        = (Button) findViewById(R.id.cancel_button);
+
+    this.trustedServerButton.setOnClickListener(new TrustedServerButtonClickListener());
+    this.customServerButton.setOnClickListener(new CustomServerButtonClickListener());
+    this.cancelButton.setOnClickListener(new CancelButtonClickListener());
+  }
+
+  private class CancelButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      SilencePreferences.disableXmpp(context);
+      finishActivity();
+    }
+  }
+
+  private class TrustedServerButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      new RegisterOnTrustedServerTask(context).execute();
+    }
+  }
+
+  private class CustomServerButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      startActivityForResult(new Intent(context, XmppRegisterCustomActivity.class), REGISTERING_CUSTOM_ACTIVITY_RESULT_CODE);
+    }
+  }
+
+  private class RegisterOnTrustedServerTask extends ProgressDialogAsyncTask<Void, Void, Void> {
+    private final Context context;
+
+    public RegisterOnTrustedServerTask(final Context context) {
+      super(context,
+            context.getString(R.string.register_xmpp_account_registration),
+            context.getString(R.string.register_xmpp_account_creating_an_xmpp_account));
+      this.context = context;
+    }
+
+    @Override
+    protected Void doInBackground(Void... params) {
+      try {
+        XmppUtil.tryToRegister(context);
+        new Thread() {
+          @Override
+          public void run() {
+            Looper.prepare();
+            Toast.makeText(context.getApplicationContext(),
+                           context.getString(R.string.XmppRegisterActivity__registered),
+                           Toast.LENGTH_LONG).show();
+            Looper.loop();
+          }
+        }.start();
+      } catch (Exception e) {
+        Log.w(TAG, e);
+        new Thread() {
+          @Override
+          public void run() {
+            Looper.prepare();
+            Toast.makeText(context,
+                           context.getString(R.string.XmppRegisterActivity__cannot_create_an_xmpp_account_please_try_again_later),
+                           Toast.LENGTH_LONG).show();
+            Looper.loop();
+          }
+        }.start();
+        SilencePreferences.disableXmpp(context);
+      }
+      finishActivity();
+      return null;
+    }
+  }
+
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    if (keyCode == KeyEvent.KEYCODE_BACK) {
+      SilencePreferences.disableXmpp(context);
+      finishActivity();
+      return true;
+    }
+    return super.onKeyDown(keyCode, event);
+  }
+
+  private void finishActivity() {
+    setResult(Activity.RESULT_OK);
+    finish();
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (requestCode == REGISTERING_CUSTOM_ACTIVITY_RESULT_CODE &&
+        resultCode  == Activity.RESULT_OK)
+    {
+      new Thread() {
+        @Override
+        public void run() {
+          Looper.prepare();
+          Toast.makeText(context.getApplicationContext(),
+                         context.getString(R.string.XmppRegisterActivity__registered),
+                         Toast.LENGTH_LONG).show();
+          Looper.loop();
+        }
+      }.start();
+      finishActivity();
+    }
+  }
+
+}
diff --git a/src/org/smssecure/smssecure/XmppRegisterCustomActivity.java b/src/org/smssecure/smssecure/XmppRegisterCustomActivity.java
new file mode 100644
index 000000000..cf71a03e6
--- /dev/null
+++ b/src/org/smssecure/smssecure/XmppRegisterCustomActivity.java
@@ -0,0 +1,145 @@
+package org.smssecure.smssecure;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.Snackbar;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import org.smssecure.smssecure.util.DynamicLanguage;
+import org.smssecure.smssecure.util.DynamicTheme;
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.task.ProgressDialogAsyncTask;
+import org.smssecure.smssecure.util.XmppUtil;
+import org.smssecure.smssecure.util.XmppUtil.XmppServer;
+
+/**
+ * Activity for registering an XMPP account on a custom server.
+ *
+ * @author Bastien Le Querrec
+ */
+public class XmppRegisterCustomActivity extends BaseActionBarActivity {
+  private static final String TAG = XmppRegisterCustomActivity.class.getSimpleName();
+
+  public static final String REGISTERED_EXTRA = "REGISTERED";
+
+  private Context context;
+
+  private DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private EditText hostnameText;
+  private EditText portText;
+  private Integer  port;
+
+  private Button connectButton;
+  private Button cancelButton;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.register_custom_xmpp_server);
+
+    initializeResources();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  private void initializeResources() {
+    this.connectButton = (Button) findViewById(R.id.connect_button);
+    this.cancelButton  = (Button) findViewById(R.id.cancel_button);
+
+    this.hostnameText = (EditText) findViewById(R.id.hostname);
+    this.portText     = (EditText) findViewById(R.id.port);
+
+    this.connectButton.setOnClickListener(new ConnectButtonClickListener());
+    this.cancelButton.setOnClickListener(new CancelButtonClickListener());
+
+    this.context = XmppRegisterCustomActivity.this;
+  }
+
+  private class CancelButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      finishActivity(false);
+    }
+  }
+
+  private class ConnectButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      try {
+        String portString = portText.getText().toString();
+        if (portString == null || portString.equals("")) {
+          port = null;
+        } else {
+          port = Integer.parseInt(portString);
+          if (port > 65535 || port < 1) throw new NumberFormatException();
+        }
+        new RegisterCustomServerTask(hostnameText.getText().toString(), port).execute();
+      } catch (NumberFormatException e) {
+        Log.w(TAG, e);
+        Snackbar.make(findViewById(android.R.id.content), getString(R.string.register_xmpp_account_invalid_port), Snackbar.LENGTH_LONG).show();
+      }
+    }
+  }
+
+  private class RegisterCustomServerTask extends ProgressDialogAsyncTask<Void, Void, Void> {
+    private final XmppServer xmppServer;
+
+    public RegisterCustomServerTask(String hostname, Integer port) {
+      super(context,
+            context.getString(R.string.register_xmpp_account_registration),
+            context.getString(R.string.register_xmpp_account_creating_an_xmpp_account));
+
+      if (port == null) {
+        this.xmppServer = new XmppServer(hostname);
+      } else {
+        this.xmppServer = new XmppServer(hostname, port);
+      }
+    }
+
+    @Override
+    protected Void doInBackground(Void... params) {
+      try {
+        XmppUtil.register(context, xmppServer);
+        SilencePreferences.enableXmpp(context);
+        XmppUtil.startService(context);
+        finishActivity(true);
+      } catch (Exception e) {
+        Log.w(TAG, e);
+        Snackbar.make(findViewById(android.R.id.content), getString(R.string.register_xmpp_account_cannot_register_on_this_server), Snackbar.LENGTH_LONG).show();
+        SilencePreferences.disableXmpp(context);
+      }
+      return null;
+    }
+  }
+
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    if (keyCode == KeyEvent.KEYCODE_BACK) {
+      finishActivity(false);
+      return true;
+    }
+    return super.onKeyDown(keyCode, event);
+  }
+
+  private void finishActivity(boolean registered) {
+    setResult(registered ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
+    finish();
+  }
+
+}
diff --git a/src/org/smssecure/smssecure/components/reminder/Reminder.java b/src/org/smssecure/smssecure/components/reminder/Reminder.java
index 71ca5f029..c37c54087 100644
--- a/src/org/smssecure/smssecure/components/reminder/Reminder.java
+++ b/src/org/smssecure/smssecure/components/reminder/Reminder.java
@@ -2,6 +2,7 @@ package org.smssecure.smssecure.components.reminder;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.view.View.OnClickListener;
 
@@ -13,9 +14,9 @@ public abstract class Reminder {
   private OnClickListener okListener;
   private OnClickListener dismissListener;
 
-  public Reminder(@NonNull CharSequence title,
-                  @NonNull CharSequence text,
-                  @NonNull CharSequence buttonText)
+  public Reminder(@NonNull  CharSequence title,
+                  @NonNull  CharSequence text,
+                  @Nullable CharSequence buttonText)
   {
     this.title      = title;
     this.text       = text;
diff --git a/src/org/smssecure/smssecure/components/reminder/ReminderView.java b/src/org/smssecure/smssecure/components/reminder/ReminderView.java
index 10a6ac48c..bcc81f980 100644
--- a/src/org/smssecure/smssecure/components/reminder/ReminderView.java
+++ b/src/org/smssecure/smssecure/components/reminder/ReminderView.java
@@ -51,7 +51,6 @@ public class ReminderView extends LinearLayout {
   public void showReminder(final Reminder reminder) {
     title.setText(reminder.getTitle());
     text.setText(reminder.getText());
-    acceptButton.setText(reminder.getButtonText());
 
     acceptButton.setOnClickListener(new OnClickListener() {
       @Override
@@ -60,6 +59,12 @@ public class ReminderView extends LinearLayout {
         if (reminder.getOkListener() != null) reminder.getOkListener().onClick(v);
       }
     });
+    if (reminder.getButtonText() != null) {
+      acceptButton.setText(reminder.getButtonText());
+      acceptButton.setOnClickListener(reminder.getOkListener());
+    } else {
+      acceptButton.setVisibility(View.GONE);
+    }
 
     if (reminder.isDismissable()) {
       closeButton.setOnClickListener(new OnClickListener() {
diff --git a/src/org/smssecure/smssecure/components/reminder/XmppConnectivityDisconnectedReminder.java b/src/org/smssecure/smssecure/components/reminder/XmppConnectivityDisconnectedReminder.java
new file mode 100644
index 000000000..926e548bb
--- /dev/null
+++ b/src/org/smssecure/smssecure/components/reminder/XmppConnectivityDisconnectedReminder.java
@@ -0,0 +1,29 @@
+package org.smssecure.smssecure.components.reminder;
+
+import android.content.Context;
+
+import org.smssecure.smssecure.R;
+import org.smssecure.smssecure.service.XmppService;
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.XmppUtil;
+
+public class XmppConnectivityDisconnectedReminder extends Reminder {
+
+  public XmppConnectivityDisconnectedReminder(final Context context) {
+    super(context.getString(R.string.XmppService_cannot_reach_xmpp_server),
+          context.getString(R.string.XmppService_xmpp_features_in_silence_are_disabled),
+          null);
+  }
+
+  public static boolean isEligible(Context context) {
+    XmppService xmppService = XmppService.getInstance();
+    return SilencePreferences.isXmppRegistered(context) &&
+          !XmppUtil.isXmppAvailable(context)            &&
+          xmppService != null                           &&
+          !xmppService.getConnectionStatus().equals(XmppService.CONNECTED);
+  }
+
+  public boolean isDismissable() {
+    return false;
+  }
+}
diff --git a/src/org/smssecure/smssecure/crypto/SmsCipher.java b/src/org/smssecure/smssecure/crypto/SmsCipher.java
index c58a7d280..c6b2c6fa6 100644
--- a/src/org/smssecure/smssecure/crypto/SmsCipher.java
+++ b/src/org/smssecure/smssecure/crypto/SmsCipher.java
@@ -1,7 +1,10 @@
 package org.smssecure.smssecure.crypto;
 
 import android.content.Context;
+import android.os.AsyncTask;
+import android.util.Log;
 
+import org.smssecure.smssecure.database.DatabaseFactory;
 import org.smssecure.smssecure.recipients.Recipient;
 import org.smssecure.smssecure.recipients.RecipientFactory;
 import org.smssecure.smssecure.recipients.RecipientFormattingException;
@@ -33,9 +36,12 @@ import org.whispersystems.libaxolotl.protocol.WhisperMessage;
 import org.whispersystems.libaxolotl.state.AxolotlStore;
 
 import java.io.IOException;
+import java.util.Map;
 
 public class SmsCipher {
 
+  private static final String TAG = SmsCipher.class.getSimpleName();
+
   private final SmsTransportDetails transportDetails = new SmsTransportDetails();
 
   private final AxolotlStore axolotlStore;
@@ -53,13 +59,23 @@ public class SmsCipher {
       WhisperMessage whisperMessage = new WhisperMessage(decoded);
       SessionCipher  sessionCipher  = new SessionCipher(axolotlStore, new AxolotlAddress(message.getSender(), 1));
       byte[]         padded         = sessionCipher.decrypt(whisperMessage);
-      byte[]         plaintext      = transportDetails.getStrippedPaddingMessageBody(padded);
+      String         plaintext      = new String(transportDetails.getStrippedPaddingMessageBody(padded));
 
-      if (message.isEndSession() && "TERMINATE".equals(new String(plaintext))) {
+      if (message.isEndSession() && "TERMINATE".equals(plaintext)) {
         axolotlStore.deleteSession(new AxolotlAddress(message.getSender(), 1));
       }
 
-      return message.withMessageBody(new String(plaintext));
+      if (message.isXmppExchange() && message.getSender() != null) { // TODO: Jid validation
+        Log.w(TAG, "Proceeding XMPP exchange...");
+        Recipients recipients = RecipientFactory.getRecipientsFromString(context, message.getSender(), true);
+
+        if (recipients.getPrimaryRecipient() != null) {
+          recipients.getPrimaryRecipient().setXmppJid(plaintext);
+          DatabaseFactory.getRecipientPreferenceDatabase(context).setXmppJid(recipients, plaintext);
+        }
+      }
+
+      return message.withMessageBody(plaintext);
     } catch (IOException e) {
       throw new InvalidMessageException(e);
     }
diff --git a/src/org/smssecure/smssecure/database/CanonicalAddressDatabase.java b/src/org/smssecure/smssecure/database/CanonicalAddressDatabase.java
index 1075be701..79fd4b883 100644
--- a/src/org/smssecure/smssecure/database/CanonicalAddressDatabase.java
+++ b/src/org/smssecure/smssecure/database/CanonicalAddressDatabase.java
@@ -146,30 +146,18 @@ public class CanonicalAddressDatabase {
   }
 
   public long getCanonicalAddressId(@NonNull String address) {
-    try {
-      long canonicalAddressId;
-
-      if (isNumberAddress(address) && SilencePreferences.isPushRegistered(context)) {
-        String localNumber = SilencePreferences.getLocalNumber(context);
-
-        if (!ShortCodeUtil.isShortCode(localNumber, address)) {
-          address = PhoneNumberFormatter.formatNumber(address, localNumber);
-        }
-      }
+    long canonicalAddressId;
 
-      if ((canonicalAddressId = getCanonicalAddressFromCache(address)) != -1) {
-        return canonicalAddressId;
-      }
+    if ((canonicalAddressId = getCanonicalAddressFromCache(address)) != -1) {
+      return canonicalAddressId;
+    }
 
-      canonicalAddressId = getCanonicalAddressIdFromDatabase(address);
+    canonicalAddressId = getCanonicalAddressIdFromDatabase(address);
 
-      idCache.put(canonicalAddressId, address);
-      addressCache.put(address, canonicalAddressId);
+    idCache.put(canonicalAddressId, address);
+    addressCache.put(address, canonicalAddressId);
 
-      return canonicalAddressId;
-    } catch (InvalidNumberException e) {
-      throw new AssertionError(e);
-    }
+    return canonicalAddressId;
   }
 
   public @NonNull List<Long> getCanonicalAddressIds(@NonNull List<String> addresses) {
@@ -187,6 +175,28 @@ public class CanonicalAddressDatabase {
     return cachedAddress == null ? -1L : cachedAddress;
   }
 
+  public List<String> getCanonicalNumbers() {
+    SQLiteDatabase db     = databaseHelper.getWritableDatabase();
+    Cursor         cursor = null;
+
+    try {
+      cursor = db.query(TABLE, null, null, null, null, null, null);
+
+      List<String> recipients = new LinkedList<>();
+
+      while (cursor != null && cursor.moveToNext()) {
+        long   canonicalId = cursor.getLong(cursor.getColumnIndexOrThrow(ID_COLUMN));
+        String address     = cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS_COLUMN));
+        if (canonicalId > 1) recipients.add(address);
+      }
+
+      return recipients;
+    } finally {
+      if (cursor != null)
+        cursor.close();
+    }
+  }
+
   private long getCanonicalAddressIdFromDatabase(@NonNull String address) {
     Log.w(TAG, "Hitting DB on query [ADDRESS]");
 
diff --git a/src/org/smssecure/smssecure/database/DatabaseFactory.java b/src/org/smssecure/smssecure/database/DatabaseFactory.java
index 9040e011b..4b5c306fa 100644
--- a/src/org/smssecure/smssecure/database/DatabaseFactory.java
+++ b/src/org/smssecure/smssecure/database/DatabaseFactory.java
@@ -74,9 +74,9 @@ public class DatabaseFactory {
   private static final int MIGRATED_CONVERSATION_LIST_STATUS_VERSION       = 26;
   private static final int INTRODUCED_SUBSCRIPTION_ID_VERSION              = 28;
   private static final int INTRODUCED_XMPP_TRANSPORT                       = 29;
-  private static final int DATABASE_VERSION                                = 28;
+  public  static final int DATABASE_VERSION                                = 29;
 
-  private static final String DATABASE_NAME    = "messages.db";
+  public  static final String DATABASE_NAME    = "messages.db";
   private static final Object lock             = new Object();
 
   private static DatabaseFactory instance;
@@ -517,16 +517,6 @@ public class DatabaseFactory {
       executeStatements(db, GroupDatabase.CREATE_INDEXS);
     }
 
-    @Override
-    public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-      db.beginTransaction();
-
-      if (newVersion < INTRODUCED_XMPP_TRANSPORT) {}
-
-      db.setTransactionSuccessful();
-      db.endTransaction();
-    }
-
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
       db.beginTransaction();
@@ -828,6 +818,15 @@ public class DatabaseFactory {
         db.execSQL("ALTER TABLE mms ADD COLUMN subscription_id INTEGER DEFAULT -1");
       }
 
+      if (oldVersion < INTRODUCED_XMPP_TRANSPORT) {
+        try {
+          db.execSQL("ALTER TABLE recipient_preferences ADD COLUMN xmpp_jid TEXT DEFAULT NULL");
+          db.execSQL("ALTER TABLE sms ADD COLUMN xmpp_id TEXT DEFAULT NULL");
+        } catch (Exception e) {
+          Log.w(TAG, e.getMessage());
+        }
+      }
+
       db.setTransactionSuccessful();
       db.endTransaction();
     }
diff --git a/src/org/smssecure/smssecure/database/EncryptingSmsDatabase.java b/src/org/smssecure/smssecure/database/EncryptingSmsDatabase.java
index 48bed2e39..8b4f702e4 100644
--- a/src/org/smssecure/smssecure/database/EncryptingSmsDatabase.java
+++ b/src/org/smssecure/smssecure/database/EncryptingSmsDatabase.java
@@ -60,14 +60,13 @@ public class EncryptingSmsDatabase extends SmsDatabase {
   }
 
   public long insertMessageOutbox(MasterSecret masterSecret, long threadId,
-                                  OutgoingTextMessage message, boolean forceSms,
-                                  long timestamp)
+                                  OutgoingTextMessage message, long timestamp)
   {
     long type = Types.BASE_OUTBOX_TYPE;
     message   = message.withBody(getEncryptedBody(masterSecret, message.getMessageBody()));
     type     |= Types.ENCRYPTION_SYMMETRIC_BIT;
 
-    return insertMessageOutbox(threadId, message, type, forceSms, timestamp);
+    return insertMessageOutbox(threadId, message, type, timestamp);
   }
 
   public Pair<Long, Long> insertMessageInbox(MasterSecret masterSecret,
diff --git a/src/org/smssecure/smssecure/database/MmsDatabase.java b/src/org/smssecure/smssecure/database/MmsDatabase.java
index ed9af5e01..8b5e7468b 100644
--- a/src/org/smssecure/smssecure/database/MmsDatabase.java
+++ b/src/org/smssecure/smssecure/database/MmsDatabase.java
@@ -50,6 +50,7 @@ import org.smssecure.smssecure.mms.IncomingMediaMessage;
 import org.smssecure.smssecure.mms.OutgoingGroupMediaMessage;
 import org.smssecure.smssecure.mms.OutgoingMediaMessage;
 import org.smssecure.smssecure.mms.OutgoingSecureMediaMessage;
+import org.smssecure.smssecure.mms.OutgoingXmppMediaMessage;
 import org.smssecure.smssecure.mms.SlideDeck;
 import org.smssecure.smssecure.recipients.Recipient;
 import org.smssecure.smssecure.recipients.RecipientFactory;
@@ -222,11 +223,7 @@ public class MmsDatabase extends MessagingDatabase {
 
     group.add(retrieved.getAddresses().getFrom());
 
-    if (SilencePreferences.isPushRegistered(context)) {
-      localNumber = SilencePreferences.getLocalNumber(context);
-    } else {
-      localNumber = ServiceUtil.getTelephonyManager(context).getLine1Number();
-    }
+    localNumber = ServiceUtil.getTelephonyManager(context).getLine1Number();
 
     for (String cc : retrieved.getAddresses().getCc()) {
       PhoneNumberUtil.MatchType match;
@@ -300,11 +297,6 @@ public class MmsDatabase extends MessagingDatabase {
     notifyConversationListeners(getThreadIdForMessage(messageId));
   }
 
-  public void markAsForcedSms(long messageId) {
-    updateMailboxBitmask(messageId, Types.PUSH_MESSAGE_BIT, Types.MESSAGE_FORCE_SMS_BIT);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
-  }
-
   public void markAsPendingSecureSmsFallback(long messageId) {
     updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_PENDING_SECURE_SMS_FALLBACK);
     notifyConversationListeners(getThreadIdForMessage(messageId));
@@ -361,8 +353,8 @@ public class MmsDatabase extends MessagingDatabase {
     updateMailboxBitmask(messageId, Types.SECURE_MESSAGE_BIT, 0);
   }
 
-  public void markAsPush(long messageId) {
-    updateMailboxBitmask(messageId, 0, Types.PUSH_MESSAGE_BIT);
+  public void markAsXmpp(long messageId) {
+    updateMailboxBitmask(messageId, 0, Types.XMPP_MESSAGE_BIT);
   }
 
   public void markAsDecryptFailed(long messageId, long threadId) {
@@ -455,6 +447,10 @@ public class MmsDatabase extends MessagingDatabase {
         OutgoingMediaMessage message = new OutgoingMediaMessage(recipients, body, attachments, timestamp, subscriptionId,
                                                                 !addresses.getBcc().isEmpty() ? ThreadDatabase.DistributionTypes.BROADCAST :
                                                                                                 ThreadDatabase.DistributionTypes.DEFAULT);
+        if (Types.isXmppType(outboxType)) {
+          return new OutgoingXmppMediaMessage(message);
+        }
+
         if (Types.isSecureType(outboxType)) {
           return new OutgoingSecureMediaMessage(message);
         }
@@ -566,8 +562,7 @@ public class MmsDatabase extends MessagingDatabase {
       throws MmsException
   {
     return insertMessageInbox(masterSecret, retrieved, contentLocation, threadId,
-                              Types.BASE_INBOX_TYPE | Types.ENCRYPTION_SYMMETRIC_BIT |
-                              (retrieved.isPushMessage() ? Types.PUSH_MESSAGE_BIT : 0));
+                              Types.BASE_INBOX_TYPE | Types.ENCRYPTION_SYMMETRIC_BIT);
   }
 
   public Pair<Long, Long> insertSecureMessageInbox(MasterSecret masterSecret,
@@ -587,8 +582,7 @@ public class MmsDatabase extends MessagingDatabase {
   {
     return insertMessageInbox(masterSecret, retrieved, "", threadId,
                               Types.BASE_INBOX_TYPE | Types.SECURE_MESSAGE_BIT |
-                              Types.ENCRYPTION_SYMMETRIC_BIT |
-                              (retrieved.isPushMessage() ? Types.PUSH_MESSAGE_BIT : 0));
+                              Types.ENCRYPTION_SYMMETRIC_BIT);
   }
 
   public Pair<Long, Long> insertMessageInbox(@NonNull NotificationInd notification, int subscriptionId) {
@@ -647,13 +641,12 @@ public class MmsDatabase extends MessagingDatabase {
   }
 
   public long insertMessageOutbox(MasterSecret masterSecret, OutgoingMediaMessage message,
-                                  long threadId, boolean forceSms)
+                                  long threadId)
       throws MmsException
   {
     long type = Types.BASE_OUTBOX_TYPE | Types.ENCRYPTION_SYMMETRIC_BIT;
 
     if (message.isSecure()) type |= Types.SECURE_MESSAGE_BIT;
-    if (forceSms)           type |= Types.MESSAGE_FORCE_SMS_BIT;
 
     if (message.isGroup()) {
       if      (((OutgoingGroupMediaMessage)message).isGroupUpdate()) type |= Types.GROUP_UPDATE_BIT;
diff --git a/src/org/smssecure/smssecure/database/MmsSmsColumns.java b/src/org/smssecure/smssecure/database/MmsSmsColumns.java
index ad2a172c3..3f2c4c774 100644
--- a/src/org/smssecure/smssecure/database/MmsSmsColumns.java
+++ b/src/org/smssecure/smssecure/database/MmsSmsColumns.java
@@ -38,7 +38,6 @@ public interface MmsSmsColumns {
 
     // Message attributes
     protected static final long MESSAGE_ATTRIBUTE_MASK = 0xE0;
-    protected static final long MESSAGE_FORCE_SMS_BIT  = 0x40;
 
     // Key Exchange Information
     protected static final long KEY_EXCHANGE_MASK                = 0xFF00;
@@ -53,7 +52,7 @@ public interface MmsSmsColumns {
     // Secure Message Information
     protected static final long SECURE_MESSAGE_BIT = 0x800000;
     protected static final long END_SESSION_BIT    = 0x400000;
-    protected static final long PUSH_MESSAGE_BIT   = 0x200000;
+    protected static final long XMPP_MESSAGE_BIT   = 0x200000;
 
     // Group Message Information
     protected static final long GROUP_UPDATE_BIT = 0x10000;
@@ -89,10 +88,6 @@ public interface MmsSmsColumns {
       return false;
     }
 
-    public static boolean isForcedSms(long type) {
-      return (type & MESSAGE_FORCE_SMS_BIT) != 0;
-    }
-
     public static boolean isPendingMessageType(long type) {
       return
           (type & BASE_TYPE_MASK) == BASE_OUTBOX_TYPE ||
@@ -120,10 +115,6 @@ public interface MmsSmsColumns {
       return (type & SECURE_MESSAGE_BIT) != 0;
     }
 
-    public static boolean isPushType(long type) {
-      return (type & PUSH_MESSAGE_BIT) != 0;
-    }
-
     public static boolean isEndSessionType(long type) {
       return (type & END_SESSION_BIT) != 0;
     }
@@ -194,6 +185,10 @@ public interface MmsSmsColumns {
       return (type & ENCRYPTION_REMOTE_LEGACY_BIT) != 0;
     }
 
+    public static boolean isXmppType(long type) {
+      return (type & XMPP_MESSAGE_BIT) != 0;
+    }
+
     public static boolean isXmppExchangeType(long type) {
       return (type & XMPP_EXCHANGE_BIT) != 0;
     }
diff --git a/src/org/smssecure/smssecure/database/RecipientPreferenceDatabase.java b/src/org/smssecure/smssecure/database/RecipientPreferenceDatabase.java
index e960ca21a..0146e64b2 100644
--- a/src/org/smssecure/smssecure/database/RecipientPreferenceDatabase.java
+++ b/src/org/smssecure/smssecure/database/RecipientPreferenceDatabase.java
@@ -32,6 +32,7 @@ public class RecipientPreferenceDatabase extends Database {
   private static final String MUTE_UNTIL              = "mute_until";
   private static final String COLOR                   = "color";
   private static final String DEFAULT_SUBSCRIPTION_ID = "default_subscription_id";
+  public  static final String XMPP_JID                = "xmpp_jid";
 
   public enum VibrateState {
     DEFAULT(0), ENABLED(1), DISABLED(2);
@@ -60,7 +61,8 @@ public class RecipientPreferenceDatabase extends Database {
           VIBRATE + " INTEGER DEFAULT " + VibrateState.DEFAULT.getId() + ", " +
           MUTE_UNTIL + " INTEGER DEFAULT 0, " +
           COLOR + " TEXT DEFAULT NULL, " +
-          DEFAULT_SUBSCRIPTION_ID + " INTEGER DEFAULT -1);";
+          DEFAULT_SUBSCRIPTION_ID + " INTEGER DEFAULT -1, " +
+          XMPP_JID + " TEXT DEFAULT NULL);";
 
   public RecipientPreferenceDatabase(Context context, SQLiteOpenHelper databaseHelper) {
     super(context, databaseHelper);
@@ -95,6 +97,7 @@ public class RecipientPreferenceDatabase extends Database {
         String  serializedColor       = cursor.getString(cursor.getColumnIndexOrThrow(COLOR));
         Uri     notificationUri       = notification == null ? null : Uri.parse(notification);
         int     defaultSubscriptionId = cursor.getInt(cursor.getColumnIndexOrThrow(DEFAULT_SUBSCRIPTION_ID));
+        String  xmppJid               = cursor.getString(cursor.getColumnIndexOrThrow(XMPP_JID));
 
         MaterialColor color;
 
@@ -109,7 +112,8 @@ public class RecipientPreferenceDatabase extends Database {
 
         return Optional.of(new RecipientsPreferences(blocked, muteUntil,
                                                      VibrateState.fromId(vibrateState),
-                                                     notificationUri, color, defaultSubscriptionId));
+                                                     notificationUri, color, defaultSubscriptionId,
+                                                     xmppJid));
       }
 
       return Optional.absent();
@@ -124,6 +128,12 @@ public class RecipientPreferenceDatabase extends Database {
     updateOrInsert(recipients, values);
   }
 
+  public void setXmppJid(Recipients recipients, @Nullable String xmppJid) {
+    ContentValues values = new ContentValues();
+    values.put(XMPP_JID, xmppJid.equals("NULL") ? null : xmppJid);
+    updateOrInsert(recipients, values);
+  }
+
   public void setDefaultSubscriptionId(@NonNull  Recipients recipients, int defaultSubscriptionId) {
     ContentValues values = new ContentValues();
     values.put(DEFAULT_SUBSCRIPTION_ID, defaultSubscriptionId);
@@ -182,12 +192,14 @@ public class RecipientPreferenceDatabase extends Database {
     private final Uri           notification;
     private final MaterialColor color;
     private final int           defaultSubscriptionId;
+    private final String        xmppJid;
 
     public RecipientsPreferences(boolean blocked, long muteUntil,
                                  @NonNull VibrateState vibrateState,
                                  @Nullable Uri notification,
                                  @Nullable MaterialColor color,
-                                 int defaultSubscriptionId)
+                                 int defaultSubscriptionId,
+                                 @Nullable String xmppJid)
     {
       this.blocked               = blocked;
       this.muteUntil             = muteUntil;
@@ -195,12 +207,17 @@ public class RecipientPreferenceDatabase extends Database {
       this.notification          = notification;
       this.color                 = color;
       this.defaultSubscriptionId = defaultSubscriptionId;
+      this.xmppJid               = xmppJid;
     }
 
     public @Nullable MaterialColor getColor() {
       return color;
     }
 
+    public @Nullable String getXmppJid() {
+      return xmppJid;
+    }
+
     public boolean isBlocked() {
       return blocked;
     }
diff --git a/src/org/smssecure/smssecure/database/SmsDatabase.java b/src/org/smssecure/smssecure/database/SmsDatabase.java
index bb02df0e6..07d18cb69 100644
--- a/src/org/smssecure/smssecure/database/SmsDatabase.java
+++ b/src/org/smssecure/smssecure/database/SmsDatabase.java
@@ -72,13 +72,14 @@ public class SmsDatabase extends MessagingDatabase {
   public  static final String REPLY_PATH_PRESENT = "reply_path_present";
   public  static final String SUBJECT            = "subject";
   public  static final String SERVICE_CENTER     = "service_center";
+  public  static final String XMPP_ID            = "xmpp_id";
 
   public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " integer PRIMARY KEY, "                +
     THREAD_ID + " INTEGER, " + ADDRESS + " TEXT, " + ADDRESS_DEVICE_ID + " INTEGER DEFAULT 1, " + PERSON + " INTEGER, " +
     DATE_RECEIVED  + " INTEGER, " + DATE_SENT + " INTEGER, " + PROTOCOL + " INTEGER, " + READ + " INTEGER DEFAULT 0, " +
     STATUS + " INTEGER DEFAULT -1," + TYPE + " INTEGER, " + REPLY_PATH_PRESENT + " INTEGER, " +
     DATE_DELIVERY_RECEIVED + " INTEGER DEFAULT 0," + SUBJECT + " TEXT, " + BODY + " TEXT, " +
-    MISMATCHED_IDENTITIES + " TEXT DEFAULT NULL, " + SERVICE_CENTER + " TEXT, " + SUBSCRIPTION_ID + " INTEGER DEFAULT -1);";
+    MISMATCHED_IDENTITIES + " TEXT DEFAULT NULL, " + SERVICE_CENTER + " TEXT, " + SUBSCRIPTION_ID + " INTEGER DEFAULT -1, " + XMPP_ID + " TEXT DEFAULT NULL);";
 
   public static final String[] CREATE_INDEXS = {
     "CREATE INDEX IF NOT EXISTS sms_thread_id_index ON " + TABLE_NAME + " (" + THREAD_ID + ");",
@@ -142,6 +143,25 @@ public class SmsDatabase extends MessagingDatabase {
     }
   }
 
+  public long getMessageIdFromXmpp(String id) {
+    String sql        = "SELECT " + ID + " FROM " + TABLE_NAME + " WHERE " + XMPP_ID + " = ?";
+    String[] sqlArgs  = new String[] {id+""};
+    SQLiteDatabase db = databaseHelper.getReadableDatabase();
+
+    Cursor cursor = null;
+
+    try {
+      cursor = db.rawQuery(sql, sqlArgs);
+      if (cursor != null && cursor.moveToFirst())
+        return cursor.getLong(0);
+      else
+        return -1;
+    } finally {
+      if (cursor != null)
+        cursor.close();
+    }
+  }
+
   public int getMessageCount() {
     SQLiteDatabase db = databaseHelper.getReadableDatabase();
     Cursor cursor     = null;
@@ -207,12 +227,8 @@ public class SmsDatabase extends MessagingDatabase {
     updateTypeBitmask(id, Types.SECURE_MESSAGE_BIT, 0);
   }
 
-  public void markAsPush(long id) {
-    updateTypeBitmask(id, 0, Types.PUSH_MESSAGE_BIT);
-  }
-
-  public void markAsForcedSms(long id) {
-    updateTypeBitmask(id, Types.PUSH_MESSAGE_BIT, Types.MESSAGE_FORCE_SMS_BIT);
+  public void markAsXmpp(long id) {
+    updateTypeBitmask(id, 0, Types.XMPP_MESSAGE_BIT);
   }
 
   public void markAsXmppExchange(long id) {
@@ -281,6 +297,14 @@ public class SmsDatabase extends MessagingDatabase {
     notifyConversationListeners(threadId);
   }
 
+  public void updateXmppId(long id, String xmppId) {
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(XMPP_ID, xmppId);
+
+    SQLiteDatabase db = databaseHelper.getWritableDatabase();
+    db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {id+""});
+  }
+
   public void markAsSentFailed(long id) {
     updateTypeBitmask(id, Types.BASE_TYPE_MASK, Types.BASE_SENT_FAILED_TYPE);
   }
@@ -373,7 +397,7 @@ public class SmsDatabase extends MessagingDatabase {
 //      type |= Types.ENCRYPTION_REMOTE_BIT;
     }
 
-    if (message.isPush()) type |= Types.PUSH_MESSAGE_BIT;
+    if (message.isXmpp()) type |= Types.XMPP_MESSAGE_BIT;
 
     Recipients recipients;
 
@@ -437,12 +461,12 @@ public class SmsDatabase extends MessagingDatabase {
   }
 
   protected long insertMessageOutbox(long threadId, OutgoingTextMessage message,
-                                     long type, boolean forceSms, long date)
+                                     long type, long date)
   {
     if      (message.isKeyExchange())   type |= Types.KEY_EXCHANGE_BIT;
     else if (message.isSecureMessage()) type |= Types.SECURE_MESSAGE_BIT;
+    else if (message.isXmppExchange())  type |= Types.XMPP_EXCHANGE_BIT;
     else if (message.isEndSession())    type |= Types.END_SESSION_BIT;
-    if      (forceSms)                  type |= Types.MESSAGE_FORCE_SMS_BIT;
 
     ContentValues contentValues = new ContentValues(7);
     contentValues.put(ADDRESS, PhoneNumberUtils.formatNumber(message.getRecipients().getPrimaryRecipient().getNumber()));
diff --git a/src/org/smssecure/smssecure/database/model/MessageRecord.java b/src/org/smssecure/smssecure/database/model/MessageRecord.java
index 71d05d496..4ef86bb0a 100644
--- a/src/org/smssecure/smssecure/database/model/MessageRecord.java
+++ b/src/org/smssecure/smssecure/database/model/MessageRecord.java
@@ -107,19 +107,11 @@ public abstract class MessageRecord extends DisplayRecord {
     return id;
   }
 
-  public boolean isPush() {
-    return SmsDatabase.Types.isPushType(type) && !SmsDatabase.Types.isForcedSms(type);
-  }
-
   public long getTimestamp() {
     if (SilencePreferences.showSentTime(context)) return getDateSent();
     else                                            return getDateReceived();
   }
 
-  public boolean isForcedSms() {
-    return SmsDatabase.Types.isForcedSms(type);
-  }
-
   public boolean isStaleKeyExchange() {
     return SmsDatabase.Types.isStaleKeyExchange(type);
   }
@@ -160,6 +152,10 @@ public abstract class MessageRecord extends DisplayRecord {
     return SmsDatabase.Types.isXmppExchangeType(type);
   }
 
+  public boolean isXmpp() {
+    return SmsDatabase.Types.isXmppType(type);
+  }
+
   public Recipient getIndividualRecipient() {
     return individualRecipient;
   }
diff --git a/src/org/smssecure/smssecure/database/model/SmsMessageRecord.java b/src/org/smssecure/smssecure/database/model/SmsMessageRecord.java
index af3cce642..52722f565 100644
--- a/src/org/smssecure/smssecure/database/model/SmsMessageRecord.java
+++ b/src/org/smssecure/smssecure/database/model/SmsMessageRecord.java
@@ -72,7 +72,7 @@ public class SmsMessageRecord extends MessageRecord {
     } else if (isInvalidVersionKeyExchange()) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version));
     } else if (isXmppExchange()) {
-      return emphasisAdded(context.getString(R.string.ConversationItem_xmpp_address_update_silence));
+      return emphasisAdded(context.getString(R.string.ConversationItem_xmpp_address));
     } else if (MmsSmsColumns.Types.isLegacyType(type)) {
       return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported));
     } else if (isBundleKeyExchange()) {
diff --git a/src/org/smssecure/smssecure/database/model/ThreadRecord.java b/src/org/smssecure/smssecure/database/model/ThreadRecord.java
index 703cb9dbb..e6d4dfef7 100644
--- a/src/org/smssecure/smssecure/database/model/ThreadRecord.java
+++ b/src/org/smssecure/smssecure/database/model/ThreadRecord.java
@@ -77,7 +77,7 @@ public class ThreadRecord extends DisplayRecord {
     } else if (isDuplicateMessageType()) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_duplicate_message));
     } else if (isXmppExchange()) {
-      return emphasisAdded(context.getString(R.string.ConversationItem_xmpp_address_update_silence));
+      return emphasisAdded(context.getString(R.string.ConversationItem_xmpp_address));
     } else if (SmsDatabase.Types.isFailedDecryptType(type)) {
       return emphasisAdded(context.getString(R.string.MessageDisplayHelper_bad_encrypted_message));
     } else if (SmsDatabase.Types.isNoRemoteSessionType(type)) {
diff --git a/src/org/smssecure/smssecure/jobs/MmsSendJob.java b/src/org/smssecure/smssecure/jobs/MmsSendJob.java
index 4af580263..cf5b3b580 100644
--- a/src/org/smssecure/smssecure/jobs/MmsSendJob.java
+++ b/src/org/smssecure/smssecure/jobs/MmsSendJob.java
@@ -22,6 +22,7 @@ import org.smssecure.smssecure.notifications.MessageNotifier;
 import org.smssecure.smssecure.recipients.Recipient;
 import org.smssecure.smssecure.recipients.Recipients;
 import org.smssecure.smssecure.recipients.RecipientFormattingException;
+import org.smssecure.smssecure.service.XmppService;
 import org.smssecure.smssecure.transport.InsecureFallbackApprovalException;
 import org.smssecure.smssecure.transport.UndeliverableMessageException;
 import org.smssecure.smssecure.util.Hex;
@@ -79,36 +80,52 @@ public class MmsSendJob extends SendJob {
     OutgoingMediaMessage message  = database.getOutgoingMessage(masterSecret, messageId);
 
     try {
+
       boolean upgradedSecure = false;
 
       SendReq pdu = constructSendPdu(masterSecret, message);
 
-      if (message.isSecure()) {
-        Log.w(TAG, "Encrypting MMS...");
+      if (message.isXmpp() || message.isSecure()) {
+        Log.w(TAG, "Encrypting media message...");
         pdu = getEncryptedMessage(masterSecret, pdu);
         upgradedSecure = true;
       }
 
       validateDestinations(message, pdu);
 
-      final byte[]        pduBytes = getPduBytes(masterSecret, pdu);
-      final SendConf      sendConf = new CompatMmsConnection(context).send(pduBytes, message.getSubscriptionId());
-      final MmsSendResult result   = getSendResult(sendConf, pdu, upgradedSecure);
+      final byte[] pduBytes = getPduBytes(masterSecret, pdu);
+
+      if (!message.isXmpp()) {
+
+        final SendConf      sendConf = new CompatMmsConnection(context).send(pduBytes, message.getSubscriptionId());
+        final MmsSendResult result   = getSendResult(sendConf, pdu, upgradedSecure);
+
+        if (result.isUpgradedSecure()) {
+          database.markAsSecure(messageId);
+        }
+
+        database.markAsSent(messageId);
+        markAttachmentsUploaded(messageId, message.getAttachments());
+      } else {
+        Log.w(TAG, "Sending XMPP media message...");
 
-      if (result.isUpgradedSecure()) {
         database.markAsSecure(messageId);
-      }
 
-      database.markAsSent(messageId);
-      markAttachmentsUploaded(messageId, message.getAttachments());
+        XmppService xmppService = XmppService.getInstance();
+        if (xmppService == null) throw new UndeliverableMessageException("XmppService not available!");
+        for (Attachment attachement : message.getAttachments()) {
+          Log.w(TAG, "Sending an attachement...");
+          xmppService.sendMedia(masterSecret, message.getBody(), attachement, messageId, message.getRecipients(), pduBytes);
+        }
+      }
     } catch (UndeliverableMessageException | IOException e) {
       Log.w(TAG, e);
       database.markAsSentFailed(messageId);
-      notifyMediaMessageDeliveryFailed(context, messageId);
+      MmsSendJob.notifyMediaMessageDeliveryFailed(context, messageId);
     } catch (InsecureFallbackApprovalException e) {
       Log.w(TAG, e);
       database.markAsPendingInsecureSmsFallback(messageId);
-      notifyMediaMessageDeliveryFailed(context, messageId);
+      MmsSendJob.notifyMediaMessageDeliveryFailed(context, messageId);
     }
   }
 
@@ -120,7 +137,7 @@ public class MmsSendJob extends SendJob {
   @Override
   public void onCanceled() {
     DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageId);
-    notifyMediaMessageDeliveryFailed(context, messageId);
+    MmsSendJob.notifyMediaMessageDeliveryFailed(context, messageId);
   }
 
   private byte[] getPduBytes(MasterSecret masterSecret, SendReq message)
@@ -247,7 +264,7 @@ public class MmsSendJob extends SendJob {
     return sendReq;
   }
 
-  private void notifyMediaMessageDeliveryFailed(Context context, long messageId) {
+  public static void notifyMediaMessageDeliveryFailed(Context context, long messageId) {
     long       threadId   = DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(messageId);
     Recipients recipients = DatabaseFactory.getThreadDatabase(context).getRecipientsForThreadId(threadId);
 
diff --git a/src/org/smssecure/smssecure/jobs/SmsDecryptJob.java b/src/org/smssecure/smssecure/jobs/SmsDecryptJob.java
index 6762ae9b8..f791c6b60 100644
--- a/src/org/smssecure/smssecure/jobs/SmsDecryptJob.java
+++ b/src/org/smssecure/smssecure/jobs/SmsDecryptJob.java
@@ -16,7 +16,10 @@ import org.smssecure.smssecure.database.NoSuchMessageException;
 import org.smssecure.smssecure.database.model.SmsMessageRecord;
 import org.smssecure.smssecure.jobs.requirements.MasterSecretRequirement;
 import org.smssecure.smssecure.notifications.MessageNotifier;
+import org.smssecure.smssecure.recipients.RecipientFactory;
+import org.smssecure.smssecure.recipients.Recipients;
 import org.smssecure.smssecure.service.KeyCachingService;
+import org.smssecure.smssecure.service.XmppService;
 import org.smssecure.smssecure.sms.IncomingEncryptedMessage;
 import org.smssecure.smssecure.sms.IncomingEndSessionMessage;
 import org.smssecure.smssecure.sms.IncomingKeyExchangeMessage;
@@ -25,6 +28,8 @@ import org.smssecure.smssecure.sms.IncomingTextMessage;
 import org.smssecure.smssecure.sms.IncomingXmppExchangeMessage;
 import org.smssecure.smssecure.sms.MessageSender;
 import org.smssecure.smssecure.sms.OutgoingKeyExchangeMessage;
+import org.smssecure.smssecure.sms.OutgoingTextMessage;
+import org.smssecure.smssecure.sms.OutgoingXmppExchangeMessage;
 import org.smssecure.smssecure.util.SilencePreferences;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.libaxolotl.DuplicateMessageException;
@@ -157,6 +162,8 @@ public class SmsDecryptJob extends MasterSecretJob {
 
     if (SilencePreferences.isAutoRespondKeyExchangeEnabled(context) || manualOverride) {
       try {
+        final int subscriptionId = -1; // Is there a way to get the selected SIM in conversation?
+
         SmsCipher                  cipher   = new SmsCipher(new SilenceAxolotlStore(context, masterSecret));
         OutgoingKeyExchangeMessage response = cipher.process(context, message);
 
@@ -165,7 +172,18 @@ public class SmsDecryptJob extends MasterSecretJob {
         SecurityEvent.broadcastSecurityUpdateEvent(context, threadId);
 
         if (response != null) {
-          MessageSender.send(context, masterSecret, response, threadId, true);
+          MessageSender.send(context, masterSecret, response, threadId, false);
+        }
+
+        if (SilencePreferences.isXmppRegistered(context)) {
+          Recipients recipients = RecipientFactory.getRecipientsFromString(context, message.getSender(), false);
+
+          OutgoingXmppExchangeMessage xmppExchangeMessage =
+              new OutgoingXmppExchangeMessage(new OutgoingTextMessage(recipients,
+                                                                      SilencePreferences.getXmppUsername(context) + "@" + SilencePreferences.getXmppHostname(context),
+                                                                      subscriptionId));
+
+          MessageSender.send(context, masterSecret, xmppExchangeMessage, -1, false);
         }
       } catch (InvalidVersionException e) {
         Log.w(TAG, e);
@@ -190,7 +208,16 @@ public class SmsDecryptJob extends MasterSecretJob {
      throws NoSessionException, DuplicateMessageException, InvalidMessageException, LegacyMessageException
   {
     EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
+
+    SmsCipher           cipher  = new SmsCipher(new SilenceAxolotlStore(context, masterSecret));
+    IncomingTextMessage xmppJid = cipher.decrypt(context, message);
+
     database.markAsXmppExchange(messageId);
+
+    XmppService xmppService = XmppService.getInstance();
+    if (xmppService != null) xmppService.subscribe(xmppJid.getMessageBody());
+
+    SecurityEvent.broadcastSecurityUpdateEvent(context, threadId);
   }
 
   private String getAsymmetricDecryptedBody(MasterSecret masterSecret, String body)
diff --git a/src/org/smssecure/smssecure/jobs/SmsReceiveJob.java b/src/org/smssecure/smssecure/jobs/SmsReceiveJob.java
index 0396fc7a1..09d4232ac 100644
--- a/src/org/smssecure/smssecure/jobs/SmsReceiveJob.java
+++ b/src/org/smssecure/smssecure/jobs/SmsReceiveJob.java
@@ -13,6 +13,7 @@ import org.smssecure.smssecure.database.EncryptingSmsDatabase;
 import org.smssecure.smssecure.notifications.MessageNotifier;
 import org.smssecure.smssecure.protocol.WirePrefix;
 import org.smssecure.smssecure.recipients.RecipientFactory;
+import org.smssecure.smssecure.recipients.Recipient;
 import org.smssecure.smssecure.recipients.Recipients;
 import org.smssecure.smssecure.service.KeyCachingService;
 import org.smssecure.smssecure.sms.IncomingTextMessage;
@@ -33,6 +34,8 @@ public class SmsReceiveJob extends ContextJob {
 
   private final Object[] pdus;
   private final int      subscriptionId;
+  private final String   body;
+  private final String   senderNumber;
 
   public SmsReceiveJob(Context context, Object[] pdus, int subscriptionId) {
     super(context, JobParameters.newBuilder()
@@ -42,6 +45,19 @@ public class SmsReceiveJob extends ContextJob {
 
     this.pdus           = pdus;
     this.subscriptionId = subscriptionId;
+    this.body           = null;
+    this.senderNumber   = null;
+  }
+
+  public SmsReceiveJob(Context context, String body, String senderNumber, int subscriptionId) {
+    super(context, JobParameters.newBuilder()
+                                .withPersistence()
+                                .withWakeLock(true)
+                                .create());
+    this.pdus           = null;
+    this.subscriptionId = subscriptionId;
+    this.body           = body;
+    this.senderNumber   = senderNumber;
   }
 
   @Override
@@ -50,7 +66,18 @@ public class SmsReceiveJob extends ContextJob {
   @Override
   public void onRun() {
     MasterSecret masterSecret = KeyCachingService.getMasterSecret(context);
-    Optional<IncomingTextMessage> message = assembleMessageFragments(pdus, subscriptionId, masterSecret);
+    Optional<IncomingTextMessage> message;
+
+    if (pdus != null) {
+      message = assembleMessageFragments(pdus, subscriptionId, masterSecret);
+    } else {
+      IncomingTextMessage incomingTextMessage = new IncomingTextMessage(senderNumber, 1, System.currentTimeMillis(), body, masterSecret == null);
+      if (WirePrefix.isPrefixedMessage(incomingTextMessage.getMessageBody())) {
+        message = Optional.fromNullable(multipartMessageHandler.processPotentialMultipartMessage(incomingTextMessage));
+      } else {
+        message = Optional.of(incomingTextMessage);
+      }
+    }
 
     if (message.isPresent() && !isBlocked(message.get())) {
       Pair<Long, Long> messageAndThreadId = storeMessage(message.get());
diff --git a/src/org/smssecure/smssecure/jobs/SmsSendJob.java b/src/org/smssecure/smssecure/jobs/SmsSendJob.java
index af5e10b2f..04a455d3a 100644
--- a/src/org/smssecure/smssecure/jobs/SmsSendJob.java
+++ b/src/org/smssecure/smssecure/jobs/SmsSendJob.java
@@ -16,6 +16,7 @@ import org.smssecure.smssecure.database.DatabaseFactory;
 import org.smssecure.smssecure.database.EncryptingSmsDatabase;
 import org.smssecure.smssecure.database.NoSuchMessageException;
 import org.smssecure.smssecure.database.SmsDatabase;
+import org.smssecure.smssecure.database.MmsSmsColumns;
 import org.smssecure.smssecure.database.model.SmsMessageRecord;
 import org.smssecure.smssecure.jobs.requirements.MasterSecretRequirement;
 import org.smssecure.smssecure.jobs.requirements.NetworkOrServiceRequirement;
@@ -23,6 +24,7 @@ import org.smssecure.smssecure.jobs.requirements.ServiceRequirement;
 import org.smssecure.smssecure.notifications.MessageNotifier;
 import org.smssecure.smssecure.recipients.Recipients;
 import org.smssecure.smssecure.service.SmsDeliveryListener;
+import org.smssecure.smssecure.service.XmppService;
 import org.smssecure.smssecure.sms.MultipartSmsMessageHandler;
 import org.smssecure.smssecure.sms.OutgoingTextMessage;
 import org.smssecure.smssecure.transport.InsecureFallbackApprovalException;
@@ -32,6 +34,7 @@ import org.smssecure.smssecure.util.SilencePreferences;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.libaxolotl.NoSessionException;
 
+import java.lang.StringBuilder;
 import java.util.ArrayList;
 
 public class SmsSendJob extends SendJob {
@@ -91,7 +94,7 @@ public class SmsSendJob extends SendJob {
   private void deliver(MasterSecret masterSecret, SmsMessageRecord message)
       throws UndeliverableMessageException, InsecureFallbackApprovalException
   {
-    if (message.isSecure() || message.isKeyExchange() || message.isEndSession()) {
+    if (message.isSecure() || message.isKeyExchange() || message.isEndSession() || message.isXmppExchange() || message.isXmpp()) {
       deliverSecureMessage(masterSecret, message);
     } else {
       deliverPlaintextMessage(message);
@@ -101,38 +104,55 @@ public class SmsSendJob extends SendJob {
   private void deliverSecureMessage(MasterSecret masterSecret, SmsMessageRecord message)
       throws UndeliverableMessageException, InsecureFallbackApprovalException
   {
-    MultipartSmsMessageHandler multipartMessageHandler = new MultipartSmsMessageHandler();
-    OutgoingTextMessage        transportMessage        = OutgoingTextMessage.from(message);
-
-    if (message.isSecure() || message.isEndSession()) {
+    OutgoingTextMessage transportMessage = OutgoingTextMessage.from(message);
+    if (message.isSecure() || message.isEndSession() || message.isXmppExchange()) {
       transportMessage = getAsymmetricEncrypt(masterSecret, transportMessage);
     }
 
-    ArrayList<String> messages                = multipartMessageHandler.divideMessage(transportMessage);
-    ArrayList<PendingIntent> sentIntents      = constructSentIntents(message.getId(), message.getType(), messages, message.isSecure());
-    ArrayList<PendingIntent> deliveredIntents = constructDeliveredIntents(message.getId(), message.getType(), messages);
-
-    Log.w("SmsTransport", "Secure divide into message parts: " + messages.size());
+    MultipartSmsMessageHandler multipartMessageHandler = new MultipartSmsMessageHandler();
+    ArrayList<String>          messages                = multipartMessageHandler.divideMessage(transportMessage, message.isXmpp());
+
+    if (!message.isXmpp()) {
+      ArrayList<PendingIntent> sentIntents      = constructSentIntents(message.getId(), message.getType(), messages, message.isSecure());
+      ArrayList<PendingIntent> deliveredIntents = constructDeliveredIntents(message.getId(), message.getType(), messages);
+
+      Log.w("SmsTransport", "Secure divide into message parts: " + messages.size());
+
+      for (int i=0;i<messages.size();i++) {
+        // NOTE 11/04/14 -- There's apparently a bug where for some unknown recipients
+        // and messages, this will throw an NPE.  We have no idea why, so we're just
+        // catching it and marking the message as a failure.  That way at least it
+        // doesn't repeatedly crash every time you start the app.
+        try {
+          SmsManager.getDefault().sendTextMessage(message.getIndividualRecipient().getNumber(), null, messages.get(i),
+                                                  sentIntents.get(i),
+                                                  deliveredIntents == null ? null : deliveredIntents.get(i));
+        } catch (NullPointerException npe) {
+          Log.w(TAG, npe);
+          Log.w(TAG, "Recipient: " + message.getIndividualRecipient().getNumber());
+          Log.w(TAG, "Message Total Parts/Current: " + messages.size() + "/" + i);
+          Log.w(TAG, "Message Part Length: " + messages.get(i).getBytes().length);
+          throw new UndeliverableMessageException(npe);
+        } catch (IllegalArgumentException iae) {
+          Log.w(TAG, iae);
+          throw new UndeliverableMessageException(iae);
+        }
+      }
+    } else {
+      Log.w(TAG, "Sending XMPP message...");
 
-    for (int i=0;i<messages.size();i++) {
-      // NOTE 11/04/14 -- There's apparently a bug where for some unknown recipients
-      // and messages, this will throw an NPE.  We have no idea why, so we're just
-      // catching it and marking the message as a failure.  That way at least it
-      // doesn't repeatedly crash every time you start the app.
-      try {
-        SmsManager.getDefault().sendTextMessage(message.getIndividualRecipient().getNumber(), null, messages.get(i),
-                                                sentIntents.get(i),
-                                                deliveredIntents == null ? null : deliveredIntents.get(i));
-      } catch (NullPointerException npe) {
-        Log.w(TAG, npe);
-        Log.w(TAG, "Recipient: " + message.getIndividualRecipient().getNumber());
-        Log.w(TAG, "Message Total Parts/Current: " + messages.size() + "/" + i);
-        Log.w(TAG, "Message Part Length: " + messages.get(i).getBytes().length);
-        throw new UndeliverableMessageException(npe);
-      } catch (IllegalArgumentException iae) {
-        Log.w(TAG, iae);
-        throw new UndeliverableMessageException(iae);
+      StringBuilder stringBuilder = new StringBuilder();
+      for (String string : messages) {
+        stringBuilder.append(string.trim());
       }
+
+      String deliveryReceiptId = XmppService.getInstance().send(stringBuilder.toString(), message.getIndividualRecipient());
+      Log.w(TAG, "deliveryReceiptId: " + deliveryReceiptId);
+
+      EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(context);
+      long messageId = message.getId();
+      database.updateXmppId(messageId, deliveryReceiptId);
+      database.markAsSent(messageId);
     }
   }
 
diff --git a/src/org/smssecure/smssecure/mms/MmsSendResult.java b/src/org/smssecure/smssecure/mms/MmsSendResult.java
index 1de7dcef8..dfc27be8e 100644
--- a/src/org/smssecure/smssecure/mms/MmsSendResult.java
+++ b/src/org/smssecure/smssecure/mms/MmsSendResult.java
@@ -11,11 +11,7 @@ public class MmsSendResult {
     this.messageId      = messageId;
     this.responseStatus = responseStatus;
     this.upgradedSecure = upgradedSecure;
-    this.push           = push;
-  }
-
-  public boolean isPush() {
-    return push;
+    this.push           = false;
   }
 
   public boolean isUpgradedSecure() {
diff --git a/src/org/smssecure/smssecure/mms/OutgoingMediaMessage.java b/src/org/smssecure/smssecure/mms/OutgoingMediaMessage.java
index 5a5f3cada..6dd2f45f0 100644
--- a/src/org/smssecure/smssecure/mms/OutgoingMediaMessage.java
+++ b/src/org/smssecure/smssecure/mms/OutgoingMediaMessage.java
@@ -72,6 +72,10 @@ public class OutgoingMediaMessage {
     return false;
   }
 
+  public boolean isXmpp() {
+    return false;
+  }
+
   public long getSentTimeMillis() {
     return sentTimeMillis;
   }
diff --git a/src/org/smssecure/smssecure/mms/OutgoingXmppMediaMessage.java b/src/org/smssecure/smssecure/mms/OutgoingXmppMediaMessage.java
new file mode 100644
index 000000000..54ba77108
--- /dev/null
+++ b/src/org/smssecure/smssecure/mms/OutgoingXmppMediaMessage.java
@@ -0,0 +1,33 @@
+package org.smssecure.smssecure.mms;
+
+import android.content.Context;
+
+import org.smssecure.smssecure.attachments.Attachment;
+import org.smssecure.smssecure.recipients.Recipients;
+
+import java.util.List;
+
+public class OutgoingXmppMediaMessage extends OutgoingMediaMessage {
+
+  public OutgoingXmppMediaMessage(Recipients recipients, String body,
+                                    List<Attachment> attachments,
+                                    long sentTimeMillis,
+                                    int distributionType)
+  {
+    super(recipients, body, attachments, sentTimeMillis, -1, distributionType);
+  }
+
+  public OutgoingXmppMediaMessage(OutgoingMediaMessage base) {
+    super(base);
+  }
+
+  @Override
+  public boolean isSecure() {
+    return true;
+  }
+
+  @Override
+  public boolean isXmpp() {
+    return true;
+  }
+}
diff --git a/src/org/smssecure/smssecure/notifications/WearReplyReceiver.java b/src/org/smssecure/smssecure/notifications/WearReplyReceiver.java
index c85c18d5d..4463788ae 100644
--- a/src/org/smssecure/smssecure/notifications/WearReplyReceiver.java
+++ b/src/org/smssecure/smssecure/notifications/WearReplyReceiver.java
@@ -74,7 +74,7 @@ public class WearReplyReceiver extends MasterSecretBroadcastReceiver {
             threadId = MessageSender.send(context, masterSecret, reply, -1, false);
           } else {
             OutgoingTextMessage reply = new OutgoingTextMessage(recipients, responseText.toString(), subscriptionId);
-            threadId = MessageSender.send(context, masterSecret, reply, -1, false);
+            threadId = MessageSender.send(context, masterSecret, reply, -1);
           }
 
           DatabaseFactory.getThreadDatabase(context).setRead(threadId);
diff --git a/src/org/smssecure/smssecure/preferences/ChatsPreferenceFragment.java b/src/org/smssecure/smssecure/preferences/ChatsPreferenceFragment.java
index cd3e5e32e..38e4336ab 100644
--- a/src/org/smssecure/smssecure/preferences/ChatsPreferenceFragment.java
+++ b/src/org/smssecure/smssecure/preferences/ChatsPreferenceFragment.java
@@ -8,7 +8,6 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.support.v4.preference.PreferenceFragment;
 import android.support.v7.app.AlertDialog;
-import android.text.TextUtils;
 import android.util.Log;
 
 import org.smssecure.smssecure.ApplicationPreferencesActivity;
diff --git a/src/org/smssecure/smssecure/preferences/XmppPreferenceFragment.java b/src/org/smssecure/smssecure/preferences/XmppPreferenceFragment.java
new file mode 100644
index 000000000..5a96ea737
--- /dev/null
+++ b/src/org/smssecure/smssecure/preferences/XmppPreferenceFragment.java
@@ -0,0 +1,207 @@
+package org.smssecure.smssecure.preferences;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Looper;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.support.v4.preference.PreferenceFragment;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.smssecure.smssecure.ApplicationPreferencesActivity;
+import org.smssecure.smssecure.components.SwitchPreferenceCompat;
+import org.smssecure.smssecure.crypto.MasterSecret;
+import org.smssecure.smssecure.database.RecipientPreferenceDatabase.RecipientsPreferences;
+import org.smssecure.smssecure.R;
+import org.smssecure.smssecure.recipients.RecipientFactory;
+import org.smssecure.smssecure.recipients.Recipient;
+import org.smssecure.smssecure.recipients.Recipients;
+import org.smssecure.smssecure.service.KeyCachingService;
+import org.smssecure.smssecure.service.XmppService;
+import org.smssecure.smssecure.sms.MessageSender;
+import org.smssecure.smssecure.sms.OutgoingTextMessage;
+import org.smssecure.smssecure.sms.OutgoingXmppExchangeMessage;
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.task.ProgressDialogAsyncTask;
+import org.smssecure.smssecure.util.XmppUtil;
+import org.smssecure.smssecure.XmppRegisterActivity;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class XmppPreferenceFragment extends PreferenceFragment {
+
+  private static final String TAG = XmppPreferenceFragment.class.getSimpleName();
+
+  private static final int REGISTERING_ACTIVITY_RESULT_CODE = 666;
+
+  private BroadcastReceiver xmppUpdateReceiver;
+
+  @Override
+  public void onCreate(Bundle paramBundle) {
+    super.onCreate(paramBundle);
+    addPreferencesFromResource(R.xml.preferences_xmpp);
+
+    setXmppUiSettings();
+
+    findPreference(SilencePreferences.XMPP_ENABLED_PREF)
+        .setOnPreferenceChangeListener(new RegisterXmppListener());
+
+    findPreference(SilencePreferences.XMPP_NOTIFY_CONTACTS)
+        .setOnPreferenceClickListener(new XmppNotifyContactsListener());
+
+    xmppUpdateReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        setXmppUiSettings();
+      }
+    };
+
+    getActivity().registerReceiver(xmppUpdateReceiver, new IntentFilter(XmppService.XMPP_CONNECTIVITY_EVENT));
+
+  }
+
+  private static int getUiString(Context context) {
+    if (SilencePreferences.isXmppRegistered(context)) {
+      return XmppService.getInstance().isConnected() ?
+                         R.string.preferences__xmpp_status_registered_connected :
+                         R.string.preferences__xmpp_status_registered_disconnected;
+    } else {
+      return R.string.preferences__xmpp_status_unregistered;
+    }
+  }
+
+  private void setXmppUiSettings() {
+    Context context = getActivity();
+
+    if (!SilencePreferences.isXmppRegistered(context)) {
+      ((SwitchPreferenceCompat) findPreference(SilencePreferences.XMPP_ENABLED_PREF)).setChecked(false);
+    }
+
+    findPreference(SilencePreferences.XMPP_STATUS).setSummary(XmppPreferenceFragment.getUiString(context));
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    ((ApplicationPreferencesActivity)getActivity()).getSupportActionBar().setTitle(R.string.preferences__xmpp);
+  }
+
+  private class RegisterXmppListener implements Preference.OnPreferenceChangeListener {
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+      final Context context = (Context) getActivity();
+
+      if (!SilencePreferences.isXmppRegistered(context)) {
+        startActivityForResult(new Intent(getActivity(), XmppRegisterActivity.class), REGISTERING_ACTIVITY_RESULT_CODE);
+      } else {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle(R.string.preferences__xmpp_unregistering_xmpp);
+        builder.setMessage(R.string.preferences__xmpp_unregistering_from_xmpp_will_delete_the_account_on_the_server);
+        builder.setIconAttribute(R.attr.dialog_alert_icon);
+        builder.setCancelable(false);
+        builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            ((SwitchPreferenceCompat) findPreference(SilencePreferences.XMPP_ENABLED_PREF)).setChecked(true);
+          }
+        });
+        builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            XmppUtil.sendNullXmppMessage(context);
+            XmppService.getInstance().deleteAccount();
+            findPreference(SilencePreferences.XMPP_STATUS).setSummary(R.string.preferences__xmpp_status_unregistered);
+            SilencePreferences.setXmppUsername(context, "");
+            SilencePreferences.setXmppPassword(context, "");
+            SilencePreferences.setXmppHostname(context, "");
+            SilencePreferences.setXmppPort(context, 0);
+            new Thread() {
+              @Override
+              public void run() {
+                Looper.prepare();
+                Toast.makeText(context.getApplicationContext(),
+                               context.getString(R.string.XmppRegisterActivity__unregistered),
+                               Toast.LENGTH_LONG).show();
+                Looper.loop();
+              }
+            }.start();
+          }
+        });
+        builder.show();
+      }
+      return true;
+    }
+  }
+
+  public static CharSequence getSummary(Context context) {
+    return context.getString(getUiString(context));
+  }
+
+  private class XmppNotifyContactsTask extends ProgressDialogAsyncTask<Void, Void, Void> {
+    private final Context context;
+
+    public XmppNotifyContactsTask(final Context context) {
+      super(context,
+            context.getString(R.string.preferences__xmpp_notifying),
+            context.getString(R.string.preferences__xmpp_sending_messages_to_contacts));
+      this.context = context;
+    }
+
+    @Override
+    protected Void doInBackground(Void... params) {
+      sendXmppExchangeMessages(context);
+      return null;
+    }
+  }
+
+  private class XmppNotifyContactsListener implements Preference.OnPreferenceClickListener {
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+      new XmppNotifyContactsTask(getActivity()).execute();
+
+      return true;
+    }
+  }
+
+  private void sendXmppExchangeMessages(final Context context) {
+    final MasterSecret masterSecret = KeyCachingService.getMasterSecret(context);
+
+    Recipients secureRecipients = RecipientFactory.getSecureRecipients(context, masterSecret, false);
+
+    Log.w(TAG, "Sending SMS message to: " + secureRecipients.toShortString());
+
+    for (Recipient recipient : secureRecipients) {
+      final int subscriptionId = -1; // Is there a way to get the selected SIM in conversation?
+
+      Recipients recipients = RecipientFactory.getRecipientsFor(context, recipient, false);
+
+      OutgoingXmppExchangeMessage xmppExchangeMessage =
+          new OutgoingXmppExchangeMessage(new OutgoingTextMessage(recipients,
+                                                                  SilencePreferences.getXmppUsername(context) + "@" + SilencePreferences.getXmppHostname(context),
+                                                                  subscriptionId));
+
+      MessageSender.send(context, masterSecret, xmppExchangeMessage, -1, false);
+    }
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (requestCode == REGISTERING_ACTIVITY_RESULT_CODE) {
+      setXmppUiSettings();
+    }
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    if (xmppUpdateReceiver != null) getActivity().unregisterReceiver(xmppUpdateReceiver);
+  }
+}
diff --git a/src/org/smssecure/smssecure/providers/PersistentBlobProvider.java b/src/org/smssecure/smssecure/providers/PersistentBlobProvider.java
index 428f954eb..2390bff3f 100644
--- a/src/org/smssecure/smssecure/providers/PersistentBlobProvider.java
+++ b/src/org/smssecure/smssecure/providers/PersistentBlobProvider.java
@@ -7,6 +7,7 @@ import android.content.UriMatcher;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.content.FileProvider;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
@@ -107,8 +108,9 @@ public class PersistentBlobProvider {
   }
 
   public Uri createForExternal(@NonNull String mimeType) throws IOException {
-    return Uri.fromFile(new File(getExternalDir(context),
-                        String.valueOf(System.currentTimeMillis()) + "." + getExtensionFromMimeType(mimeType)));
+    return FileProvider.getUriForFile(context,
+                                      "org.smssecure.provider.smssecure",
+                                      new File(getExternalDir(context), String.valueOf(System.currentTimeMillis()) + "." + getExtensionFromMimeType(mimeType)));
   }
 
   public boolean delete(@NonNull Uri uri) {
diff --git a/src/org/smssecure/smssecure/recipients/Recipient.java b/src/org/smssecure/smssecure/recipients/Recipient.java
index 9b366612d..f6cdac055 100644
--- a/src/org/smssecure/smssecure/recipients/Recipient.java
+++ b/src/org/smssecure/smssecure/recipients/Recipient.java
@@ -51,6 +51,7 @@ public class Recipient {
   private Uri          contactUri;
 
   @Nullable private MaterialColor color;
+  @Nullable private String        xmppJid;
 
   Recipient(long recipientId,
             @NonNull  String number,
@@ -61,12 +62,14 @@ public class Recipient {
     this.number       = number;
     this.contactPhoto = ContactPhotoFactory.getLoadingPhoto();
     this.color        = null;
+    this.xmppJid      = null;
 
     if (stale != null) {
       this.name         = stale.name;
       this.contactUri   = stale.contactUri;
       this.contactPhoto = stale.contactPhoto;
       this.color        = stale.color;
+      this.xmppJid      = stale.xmppJid;
     }
 
     future.addListener(new FutureTaskListener<RecipientDetails>() {
@@ -79,6 +82,7 @@ public class Recipient {
             Recipient.this.contactUri   = result.contactUri;
             Recipient.this.contactPhoto = result.avatar;
             Recipient.this.color        = result.color;
+            Recipient.this.xmppJid      = result.xmppJid;
           }
 
           notifyListeners();
@@ -99,6 +103,7 @@ public class Recipient {
     this.name         = details.name;
     this.contactPhoto = details.avatar;
     this.color        = details.color;
+    this.xmppJid      = details.xmppJid;
   }
 
   public synchronized @Nullable Uri getContactUri() {
@@ -123,6 +128,19 @@ public class Recipient {
     notifyListeners();
   }
 
+  public synchronized @Nullable String getXmppJid() {
+    return this.xmppJid;
+  }
+
+  public void setXmppJid(@Nullable String xmppJid) {
+    synchronized (this) {
+      if (xmppJid == null || xmppJid.equals("NULL")) xmppJid = null;
+      this.xmppJid = xmppJid;
+    }
+
+    notifyListeners();
+  }
+
   public String getNumber() {
     return number;
   }
@@ -153,7 +171,7 @@ public class Recipient {
 
   public static Recipient getUnknownRecipient() {
     return new Recipient(-1, new RecipientDetails("Unknown", "Unknown", null,
-                                                  ContactPhotoFactory.getDefaultContactPhoto(null), null));
+                                                  ContactPhotoFactory.getDefaultContactPhoto(null), null, null));
   }
 
   @Override
diff --git a/src/org/smssecure/smssecure/recipients/RecipientFactory.java b/src/org/smssecure/smssecure/recipients/RecipientFactory.java
index 5df37d2c7..d4aad831c 100644
--- a/src/org/smssecure/smssecure/recipients/RecipientFactory.java
+++ b/src/org/smssecure/smssecure/recipients/RecipientFactory.java
@@ -17,11 +17,18 @@
 package org.smssecure.smssecure.recipients;
 
 import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.smssecure.smssecure.contacts.avatars.ContactPhotoFactory;
+import org.smssecure.smssecure.crypto.MasterSecret;
+import org.smssecure.smssecure.crypto.SessionUtil;
 import org.smssecure.smssecure.database.CanonicalAddressDatabase;
+import org.smssecure.smssecure.database.DatabaseFactory;
+import org.smssecure.smssecure.database.RecipientPreferenceDatabase;
 import org.smssecure.smssecure.util.Util;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
@@ -31,7 +38,9 @@ import java.util.StringTokenizer;
 
 public class RecipientFactory {
 
-  private static final RecipientProvider provider = new RecipientProvider();
+  private static final RecipientProvider provider  = new RecipientProvider();
+  private static final String TABLE                = "recipient_preferences";
+  private static final String RECIPIENT_IDS_COLUMN = "recipient_ids";
 
   public static Recipients getRecipientsForIds(Context context, String recipientIds, boolean asynchronous) {
     if (TextUtils.isEmpty(recipientIds))
@@ -95,6 +104,20 @@ public class RecipientFactory {
     return getRecipientsForIds(context, ids, asynchronous);
   }
 
+  public static @NonNull Recipients getRecipientsFromXmpp(@NonNull Context context, @NonNull List<String> xmppAddresses, boolean asynchronous) {
+    List<String> ids = new LinkedList<>();
+
+    for (String xmppAddress : xmppAddresses) {
+      Optional<Long> id = getRecipientIdFromXmpp(context, xmppAddress);
+
+      if (id.isPresent()) {
+        ids.add(String.valueOf(id.get()));
+      }
+    }
+
+    return getRecipientsForIds(context, ids, asynchronous);
+  }
+
   private static @NonNull Recipients getRecipientsForIds(Context context, List<String> idStrings, boolean asynchronous) {
     long[]       ids      = new long[idStrings.size()];
     int          i        = 0;
@@ -118,6 +141,78 @@ public class RecipientFactory {
     return Optional.of(CanonicalAddressDatabase.getInstance(context).getCanonicalAddressId(number));
   }
 
+  public static @NonNull Recipients getXmppRecipients(@NonNull Context context, boolean asynchronous) {
+    return getRecipientsForIds(context, getXmppRecipientsIds(context), asynchronous);
+  }
+
+  private static List<String> getXmppRecipientsIds(Context context) {
+    Cursor cursor = null;
+    try {
+      DatabaseHelper databaseHelper = DatabaseHelper.getInstance(context);
+      SQLiteDatabase db             = databaseHelper.getReadableDatabase();
+      String[]       columns        = new String[]{RECIPIENT_IDS_COLUMN};
+      String[]       whereArgs      = new String[]{"NULL"};
+      String         where          = RecipientPreferenceDatabase.XMPP_JID + "!=?";
+
+      cursor = db.query(TABLE, columns, where, whereArgs, null, null, null);
+
+      List<String> recipients = new LinkedList<>();
+
+      while (cursor != null && cursor.moveToNext()) {
+        recipients.add(String.valueOf(cursor.getLong(cursor.getColumnIndexOrThrow(RECIPIENT_IDS_COLUMN))));
+      }
+
+      return recipients;
+    } finally {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+  }
+
+  private static Optional<Long> getRecipientIdFromXmpp(Context context, String xmppAddress) {
+    xmppAddress = xmppAddress.trim();
+
+    if (xmppAddress.isEmpty()) return Optional.absent();
+
+    Cursor cursor = null;
+
+    try {
+      DatabaseHelper databaseHelper = DatabaseHelper.getInstance(context);
+      SQLiteDatabase db             = databaseHelper.getReadableDatabase();
+      String[]       columns        = new String[]{RECIPIENT_IDS_COLUMN};
+      String[]       whereArgs      = new String[]{xmppAddress};
+      String         where          = RecipientPreferenceDatabase.XMPP_JID + "=?";
+
+      cursor = db.query(TABLE, columns, where, whereArgs, null, null, null, "1");
+
+      if (cursor != null && cursor.moveToFirst()) {
+        return Optional.of(cursor.getLong(cursor.getColumnIndexOrThrow(RECIPIENT_IDS_COLUMN)));
+      }
+
+      return Optional.absent();
+    } finally {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+  }
+
+  public static @NonNull Recipients getSecureRecipients(@NonNull Context context, @NonNull MasterSecret masterSecret, boolean asynchronous) {
+    List<String> addresses = CanonicalAddressDatabase.getInstance(context).getCanonicalNumbers();
+    List<Long>   secureAddresses = new LinkedList<>();
+
+    for (String address : addresses) {
+      Optional<Long> addressId = getRecipientIdFromNumber(context, address);
+      if (SessionUtil.hasSession(context, masterSecret, address) && addressId.isPresent()) secureAddresses.add(addressId.get());
+    }
+
+    long[] secureAddressesArray = new long[secureAddresses.size()];
+    for (int i = 0; i < secureAddresses.size(); i++) secureAddressesArray[i] = secureAddresses.get(i);
+
+    return getRecipientsForIds(context, secureAddressesArray, asynchronous);
+  }
+
   private static boolean hasBracketedNumber(String recipient) {
     int openBracketIndex = recipient.indexOf('<');
 
@@ -137,4 +232,29 @@ public class RecipientFactory {
     provider.clearCache();
   }
 
+  private static class DatabaseHelper extends SQLiteOpenHelper {
+
+    private static DatabaseHelper instance;
+
+    public static DatabaseHelper getInstance(Context context) {
+      if (instance == null) {
+        instance = new DatabaseHelper(context, DatabaseFactory.DATABASE_NAME, null, DatabaseFactory.DATABASE_VERSION);
+      }
+      return instance;
+    }
+
+    public DatabaseHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
+      super(context, name, factory, version);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    }
+
+  }
+
 }
diff --git a/src/org/smssecure/smssecure/recipients/RecipientProvider.java b/src/org/smssecure/smssecure/recipients/RecipientProvider.java
index 3f079200a..a26ad2eb4 100644
--- a/src/org/smssecure/smssecure/recipients/RecipientProvider.java
+++ b/src/org/smssecure/smssecure/recipients/RecipientProvider.java
@@ -67,7 +67,7 @@ public class RecipientProvider {
   private static final Map<String, RecipientDetails> STATIC_DETAILS = new HashMap<String, RecipientDetails>() {{
     put("262966", new RecipientDetails("Amazon", "262966", null,
                                        ContactPhotoFactory.getDefaultGroupPhoto(),
-                                       ContactColors.UNKNOWN_COLOR));
+                                       ContactColors.UNKNOWN_COLOR, null));
   }};
 
   Recipient getRecipient(Context context, long recipientId, boolean asynchronous) {
@@ -132,6 +132,7 @@ public class RecipientProvider {
   private @NonNull RecipientDetails getIndividualRecipientDetails(Context context, long recipientId, @NonNull String number) {
     Optional<RecipientsPreferences> preferences = DatabaseFactory.getRecipientPreferenceDatabase(context).getRecipientsPreferences(new long[]{recipientId});
     MaterialColor                   color       = preferences.isPresent() ? preferences.get().getColor() : null;
+    String                          xmppJid     = preferences.isPresent() ? preferences.get().getXmppJid() : null;
     Uri                             uri         = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
     Cursor                          cursor      = context.getContentResolver().query(uri, CALLER_ID_PROJECTION,
                                                                                      null, null, null);
@@ -146,7 +147,7 @@ public class RecipientProvider {
                                                                           Uri.withAppendedPath(Contacts.CONTENT_URI, cursor.getLong(2) + ""),
                                                                           name);
 
-          return new RecipientDetails(cursor.getString(0), resultNumber, contactUri, contactPhoto, color);
+          return new RecipientDetails(cursor.getString(0), resultNumber, contactUri, contactPhoto, color, xmppJid);
         } else {
           Log.w(TAG, "resultNumber is null");
         }
@@ -157,7 +158,7 @@ public class RecipientProvider {
     }
 
     if (STATIC_DETAILS.containsKey(number)) return STATIC_DETAILS.get(number);
-    else                                    return new RecipientDetails(null, number, null, ContactPhotoFactory.getDefaultContactPhoto(null), color);
+    else                                    return new RecipientDetails(null, number, null, ContactPhotoFactory.getDefaultContactPhoto(null), color, xmppJid);
   }
 
   private @NonNull RecipientDetails getGroupRecipientDetails(Context context, String groupId) {
@@ -167,13 +168,13 @@ public class RecipientProvider {
 
       if (record != null) {
         ContactPhoto contactPhoto = ContactPhotoFactory.getGroupContactPhoto(record.getAvatar());
-        return new RecipientDetails(record.getTitle(), groupId, null, contactPhoto, null);
+        return new RecipientDetails(record.getTitle(), groupId, null, contactPhoto, null, null);
       }
 
-      return new RecipientDetails(null, groupId, null, ContactPhotoFactory.getDefaultGroupPhoto(), null);
+      return new RecipientDetails(null, groupId, null, ContactPhotoFactory.getDefaultGroupPhoto(), null, null);
     } catch (IOException e) {
       Log.w("RecipientProvider", e);
-      return new RecipientDetails(null, groupId, null, ContactPhotoFactory.getDefaultGroupPhoto(), null);
+      return new RecipientDetails(null, groupId, null, ContactPhotoFactory.getDefaultGroupPhoto(), null, null);
     }
   }
 
@@ -202,16 +203,18 @@ public class RecipientProvider {
     @NonNull  public final ContactPhoto  avatar;
     @Nullable public final Uri           contactUri;
     @Nullable public final MaterialColor color;
+    @Nullable public final String        xmppJid;
 
     public RecipientDetails(@Nullable String name, @NonNull String number,
                             @Nullable Uri contactUri, @NonNull ContactPhoto avatar,
-                            @Nullable MaterialColor color)
+                            @Nullable MaterialColor color, @Nullable String xmppJid)
     {
       this.name       = name;
       this.number     = number;
       this.avatar     = avatar;
       this.contactUri = contactUri;
       this.color      = color;
+      this.xmppJid    = xmppJid;
     }
   }
 
@@ -274,4 +277,4 @@ public class RecipientProvider {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/org/smssecure/smssecure/recipients/Recipients.java b/src/org/smssecure/smssecure/recipients/Recipients.java
index fbd2e85a9..0db5866fe 100644
--- a/src/org/smssecure/smssecure/recipients/Recipients.java
+++ b/src/org/smssecure/smssecure/recipients/Recipients.java
@@ -178,6 +178,19 @@ public class Recipients implements Iterable<Recipient>, RecipientModifiedListene
     else if (!isEmpty())                                 recipients.get(0).setColor(color);
   }
 
+  public synchronized @Nullable String getXmppJid() {
+    if (!isSingleRecipient() || isGroupRecipient() || isEmpty()){
+      return null;
+    } else {
+      return recipients.get(0).getXmppJid();
+    }
+  }
+
+  public synchronized void setXmppJid(@NonNull String xmppJid) {
+    if      (!isSingleRecipient() || isGroupRecipient()) throw new AssertionError("Groups don't have unique JID!");
+    else if (!isEmpty())                                 recipients.get(0).setXmppJid(xmppJid);
+  }
+
   public synchronized void addListener(RecipientsModifiedListener listener) {
     if (listeners.isEmpty()) {
       for (Recipient recipient : recipients) {
diff --git a/src/org/smssecure/smssecure/service/KeyCachingService.java b/src/org/smssecure/smssecure/service/KeyCachingService.java
index 56e82d559..78c22e087 100644
--- a/src/org/smssecure/smssecure/service/KeyCachingService.java
+++ b/src/org/smssecure/smssecure/service/KeyCachingService.java
@@ -249,7 +249,7 @@ public class KeyCachingService extends Service {
     startForeground(SERVICE_RUNNING_ID, builder.build());
   }
 
-  private void foregroundServiceICS() {
+  private void foregroundServiceLegacy() {
     NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
     RemoteViews remoteViews            = new RemoteViews(getPackageName(), R.layout.key_caching_notification);
 
@@ -263,20 +263,6 @@ public class KeyCachingService extends Service {
     startForeground(SERVICE_RUNNING_ID, builder.build());
   }
 
-  private void foregroundServiceLegacy() {
-    Notification notification  = new Notification(R.drawable.icon_cached,
-                                                  getString(R.string.KeyCachingService_silence_passphrase_cached),
-                                                  System.currentTimeMillis());
-    notification.setLatestEventInfo(getApplicationContext(),
-                                    getString(R.string.KeyCachingService_passphrase_cached),
-                                    getString(R.string.KeyCachingService_silence_passphrase_cached),
-                                    buildLaunchIntent());
-    notification.tickerText = null;
-
-    stopForeground(true);
-    startForeground(SERVICE_RUNNING_ID, notification);
-  }
-
   private void foregroundService() {
     if (SilencePreferences.isPasswordDisabled(this)) {
       stopForeground(true);
@@ -285,8 +271,6 @@ public class KeyCachingService extends Service {
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
       foregroundServiceModern();
-    } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      foregroundServiceICS();
     } else {
       foregroundServiceLegacy();
     }
diff --git a/src/org/smssecure/smssecure/service/QuickResponseService.java b/src/org/smssecure/smssecure/service/QuickResponseService.java
index e91d88721..060574401 100644
--- a/src/org/smssecure/smssecure/service/QuickResponseService.java
+++ b/src/org/smssecure/smssecure/service/QuickResponseService.java
@@ -19,11 +19,14 @@ import org.smssecure.smssecure.recipients.Recipients;
 import org.smssecure.smssecure.sms.MessageSender;
 import org.smssecure.smssecure.sms.OutgoingTextMessage;
 import org.smssecure.smssecure.util.Rfc5724Uri;
+import org.smssecure.smssecure.util.ViewUtil;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
 
+import static org.smssecure.smssecure.TransportOption.Type;
+
 public class QuickResponseService extends MasterSecretIntentService {
 
   private static final String TAG = QuickResponseService.class.getSimpleName();
@@ -59,7 +62,8 @@ public class QuickResponseService extends MasterSecretIntentService {
 
       if (!TextUtils.isEmpty(content)) {
         if (recipients.isSingleRecipient()) {
-          MessageSender.send(this, masterSecret, new OutgoingTextMessage(recipients, content, subscriptionId), -1, false);
+          //boolean isXmpp = ViewUtil.findById(getApplicationContext(), R.id.send_button).getSelectedTransport().getType() == Type.SECURE_XMPP;
+          MessageSender.send(this, masterSecret, new OutgoingTextMessage(recipients, content, subscriptionId), -1);
         } else {
           MessageSender.send(this, masterSecret, new OutgoingMediaMessage(recipients, new SlideDeck(), content, System.currentTimeMillis(),
                                                                           subscriptionId, ThreadDatabase.DistributionTypes.DEFAULT), -1, false);
diff --git a/src/org/smssecure/smssecure/service/XmppHttpUpload.java b/src/org/smssecure/smssecure/service/XmppHttpUpload.java
new file mode 100644
index 000000000..19385c2f1
--- /dev/null
+++ b/src/org/smssecure/smssecure/service/XmppHttpUpload.java
@@ -0,0 +1,113 @@
+package org.smssecure.smssecure.service;
+
+// http://stackoverflow.com/questions/35007157/how-to-handle-xmpp-xep-0363-http-file-upload-feature-at-client-side-using-smack
+
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.StanzaListener;
+import org.jivesoftware.smack.filter.StanzaFilter;
+import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.packet.XMPPError;
+import org.jivesoftware.smack.provider.IntrospectionProvider;
+import org.jivesoftware.smack.provider.ProviderManager;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
+
+public class XmppHttpUpload implements StanzaListener{
+  private XMPPTCPConnection connection;
+  private String id;
+  private SlotGrantedListener listener;
+
+  static {
+    ProviderManager.addIQProvider("slot", "urn:xmpp:http:upload", new SlotIQProvider());
+  }
+
+  public static class SlotIQProvider extends IntrospectionProvider.IQIntrospectionProvider {
+    public SlotIQProvider() {
+      super(SlotIQ.class);
+    }
+  }
+
+  public static class SlotIQ extends IQ {
+    private String put;
+    private String get;
+
+    public SlotIQ() {
+      super("request", "urn:xmpp:http:upload");
+    }
+
+    public String getPut() {
+      return put;
+    }
+
+    public void setPut(String put) {
+      this.put = put;
+    }
+
+    public String getGet() {
+      return get;
+    }
+
+    public void setGet(String get) {
+      this.get = get;
+    }
+
+    @Override
+    protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
+      return null;
+    }
+  }
+
+  public interface SlotGrantedListener {
+    void slotGranted(String put, String get);
+    void slotDenied(String error);
+  }
+
+  public XmppHttpUpload(XMPPTCPConnection connection) {
+    this.connection = connection;
+  }
+
+  public void requestSlot(String to, final long messageId, final long fileSize, final String contentType, SlotGrantedListener listener)
+    throws SmackException.NotConnectedException
+  {
+    this.listener = listener;
+    final IQ iq = new IQ("request", "urn:xmpp:http:upload") {
+      @Override
+      protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
+        xml.rightAngleBracket();
+        xml.element("filename", String.valueOf(messageId));
+        xml.element("size", String.valueOf(fileSize));
+        xml.element("content-type", contentType);
+        return xml;
+      }
+    };
+    iq.setType(IQ.Type.get);
+    iq.setFrom(connection.getUser());
+    iq.setTo(to);
+
+    id = iq.getStanzaId();
+
+    connection.addAsyncStanzaListener(this, new StanzaFilter() {
+      @Override
+      public boolean accept(Stanza stanza) {
+        return id != null && id.equals(stanza.getStanzaId());
+      }
+    });
+
+    connection.sendStanza(iq);
+  }
+
+  @Override
+  public void processPacket(Stanza packet) throws SmackException.NotConnectedException {
+    connection.removeAsyncStanzaListener(this);
+    if (((IQ)packet).getType() != IQ.Type.error) {
+      SlotIQ slotIQ = (SlotIQ) packet;
+      listener.slotGranted(slotIQ.getPut(), slotIQ.getGet());
+    } else {
+      XMPPError error = packet.getError();
+      String errDesc = error.getDescriptiveText(null);
+      String errText = errDesc != null ? String.format("%s (%s)", errDesc, error.toString()) : error.toString();
+      listener.slotDenied(errText);
+    }
+  }
+
+}
diff --git a/src/org/smssecure/smssecure/service/XmppService.java b/src/org/smssecure/smssecure/service/XmppService.java
new file mode 100644
index 000000000..408aefe76
--- /dev/null
+++ b/src/org/smssecure/smssecure/service/XmppService.java
@@ -0,0 +1,683 @@
+package org.smssecure.smssecure.service;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import org.smssecure.smssecure.ApplicationContext;
+import org.smssecure.smssecure.attachments.Attachment;
+import org.smssecure.smssecure.BuildConfig;
+import org.smssecure.smssecure.crypto.MasterSecret;
+import org.smssecure.smssecure.crypto.SmsCipher;
+import org.smssecure.smssecure.crypto.storage.SilenceAxolotlStore;
+import org.smssecure.smssecure.database.DatabaseFactory;
+import org.smssecure.smssecure.database.EncryptingSmsDatabase;
+import org.smssecure.smssecure.database.MmsDatabase;
+import org.smssecure.smssecure.jobs.MmsSendJob;
+import org.smssecure.smssecure.jobs.SmsReceiveJob;
+import org.smssecure.smssecure.jobs.SmsSentJob;
+import org.smssecure.smssecure.R;
+import org.smssecure.smssecure.recipients.Recipient;
+import org.smssecure.smssecure.recipients.Recipients;
+import org.smssecure.smssecure.recipients.RecipientFactory;
+import org.smssecure.smssecure.service.SmsDeliveryListener;
+import org.smssecure.smssecure.service.XmppHttpUpload;
+import org.smssecure.smssecure.service.XmppHttpUpload.SlotGrantedListener;
+import org.smssecure.smssecure.sms.MultipartSmsMessageHandler;
+import org.smssecure.smssecure.sms.OutgoingEncryptedMessage;
+import org.smssecure.smssecure.sms.OutgoingTextMessage;
+import org.smssecure.smssecure.transport.UndeliverableMessageException;
+import org.smssecure.smssecure.util.Base64;
+import org.smssecure.smssecure.util.ServiceUtil;
+import org.smssecure.smssecure.util.SilencePreferences;
+import org.smssecure.smssecure.util.XmppUtil;
+import org.smssecure.smssecure.util.XmppUtil.XmppServer;
+
+import org.jivesoftware.smack.AbstractXMPPConnection;
+import org.jivesoftware.smack.chat.Chat;
+import org.jivesoftware.smack.chat.ChatManager;
+import org.jivesoftware.smack.chat.ChatManagerListener;
+import org.jivesoftware.smack.chat.ChatMessageListener;
+import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.ConnectionListener;
+import org.jivesoftware.smack.filter.PacketTypeFilter;
+import org.jivesoftware.smack.packet.ExtensionElement;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.PacketListener;
+import org.jivesoftware.smack.ReconnectionManager;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
+import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
+import org.jivesoftware.smack.roster.Roster;
+import org.jivesoftware.smack.roster.RosterEntry;
+import org.jivesoftware.smack.roster.RosterListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
+import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.iqregister.AccountManager;
+import org.jivesoftware.smackx.ping.android.ServerPingWithAlarmManager;
+import org.jivesoftware.smackx.receipts.DeliveryReceipt;
+import org.jivesoftware.smackx.receipts.DeliveryReceiptManager;
+import org.jivesoftware.smackx.receipts.DeliveryReceiptRequest;
+import org.jivesoftware.smackx.receipts.ReceiptReceivedListener;
+import org.jivesoftware.smackx.xdata.FormField;
+import org.jivesoftware.smackx.xdata.packet.DataForm;
+
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
+import java.io.IOException;
+import java.lang.Runnable;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+import java.util.List;
+
+public class XmppService extends Service {
+  private static final String TAG = XmppService.class.getSimpleName();
+
+  private static XmppService instance;
+  private HttpUploadService httpUploadService = null;
+
+  private Looper                     looper;
+  private ConfigureAndConnectHandler configureAndConnectHandler;
+
+  public  static final int    SERVICE_RUNNING_ID      = 4142;
+  public  static final String XMPP_CONNECTIVITY_EVENT = "org.smssecure.smssecure.XMPP_CONNECTIVITY_UPDATE";
+  private static final String USER_AGENT              = "Silence/" + BuildConfig.VERSION_NAME;
+
+  public static Integer DISCONNECTED = 0;
+  public static Integer CONNECTED    = 1;
+  public static Integer CONNECTING   = 2;
+  private Integer connectionStatus = DISCONNECTED;
+  private boolean hasBeenConnected = false;
+
+  private static int RECONNECTION_DELAY = 10; // 10s
+  private static long IDLE = 1000000;
+  private static long XMPP_SEND_MEDIA_TIMEOUT = 120; // 2min
+
+  private XMPPTCPConnection   connection;
+  private XmppServer          registeredXmppServer;
+  private Roster              roster;
+  private ReconnectionManager reconnectionManager;
+
+  private final class ConfigureAndConnectHandler extends Handler {
+    public ConfigureAndConnectHandler(Looper looper) {
+      super(looper);
+    }
+
+    @Override
+    public void handleMessage(android.os.Message message) {
+      configureAndConnect();
+    }
+  }
+
+  @Override
+  public void onCreate() {
+    Log.w(TAG, "onCreate()");
+    instance = this;
+
+    ServerPingWithAlarmManager.onCreate(getApplicationContext());
+    if (!SilencePreferences.isXmppRegistered(this)) {
+      Log.w(TAG, "Xmpp is disabled. Exiting...");
+      stopSelf();
+    } else {
+      HandlerThread thread = new HandlerThread("XmppConfigureAndConnectHandlerThread", Process.THREAD_PRIORITY_BACKGROUND);
+      thread.start();
+      configureAndConnectHandler = new ConfigureAndConnectHandler(thread.getLooper());
+    }
+
+  }
+
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId) {
+    Log.w(TAG, "onStartCommand(): received start id " + startId + ": " + intent);
+    if (SilencePreferences.isXmppRegistered(this)){
+      configureAndConnectHandler.sendMessage(configureAndConnectHandler.obtainMessage());
+    }
+
+    return START_STICKY;
+  }
+
+  private void configureAndConnect() {
+    XmppService instance = this;
+    instance.registeredXmppServer = XmppUtil.getRegisteredServer((Context) instance);
+
+    XMPPTCPConnectionConfiguration.Builder configBuilder = XmppUtil.getConfigBuilder(instance);
+    configBuilder.setServiceName(instance.registeredXmppServer.getHostname())
+                 .setPort(registeredXmppServer.getPort())
+                 .setUsernameAndPassword(instance.registeredXmppServer.getUsername(), instance.registeredXmppServer.getPassword())
+                 .setSendPresence(true)
+                 .setDebuggerEnabled(false);
+    instance.connection = new XMPPTCPConnection(configBuilder.build());
+
+    instance.connection.setPacketReplyTimeout(XmppUtil.XMPP_STANZA_TIMEOUT);
+
+    instance.connection.setUseStreamManagement(true);
+    instance.connection.setUseStreamManagementDefault(true);
+    instance.connection.setUseStreamManagementResumption(true);
+    instance.connection.setUseStreamManagementResumptionDefault(true);
+    instance.connection.addConnectionListener(new XmppServiceConnectionListener(instance));
+
+    DeliveryReceiptManager deliveryReceiptManager = DeliveryReceiptManager.getInstanceFor(instance.connection);
+    deliveryReceiptManager.autoAddDeliveryReceiptRequests();
+    deliveryReceiptManager.addReceiptReceivedListener(new XmppServiceDeliveryReceiptListener(instance));
+    instance.connection.addPacketListener(new XmppServiceDeliveryReceiptDemandListener(instance), new PacketTypeFilter(Message.class));
+
+    reconnectionManager = ReconnectionManager.getInstanceFor(instance.connection);
+    reconnectionManager.enableAutomaticReconnection();
+    reconnectionManager.setEnabledPerDefault(true);
+    reconnectionManager.setFixedDelay(RECONNECTION_DELAY);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      AlarmManager alarmManager = ServiceUtil.getAlarmManager(this);
+      Intent intent = new Intent(this, IdleReceiver.class);
+      alarmManager.setAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + IDLE, PendingIntent.getBroadcast(this, 0, intent, 0));
+    }
+
+    connect();
+  }
+
+  private void connect() {
+    Log.w(TAG, "Connecting...");
+    try {
+      instance.updateXmppStatus(CONNECTING);
+      connection.connect();
+      Log.w(TAG, "Connected!");
+      connection.login();
+      Log.w(TAG, "Authenticated!");
+
+      ServerPingWithAlarmManager.getInstanceFor(connection).setEnabled(true);
+
+      Roster.setDefaultSubscriptionMode(Roster.SubscriptionMode.accept_all);
+      roster = Roster.getInstanceFor(instance.connection);
+      roster.reload();
+      roster.addRosterListener(new XmppRosterListener(instance));
+      roster.setSubscriptionMode(Roster.SubscriptionMode.accept_all);
+
+      ServiceDiscoveryManager serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(instance.connection);
+
+      List<String> services = serviceDiscoveryManager.findServices("urn:xmpp:http:upload", true, true);
+
+      if (!services.isEmpty()) {
+        String httpUploadUrl = services.get(0);
+        if (!httpUploadUrl.isEmpty()) {
+          Log.w(TAG, "Found upload service at: " + httpUploadUrl);
+          DataForm data = DataForm.from(serviceDiscoveryManager.discoverInfo(httpUploadUrl));
+          for (FormField field : data.getFields()) {
+            if (field.getVariable().equals("max-file-size")){
+              long maxFileSize = Long.parseLong(field.getValues().get(0));
+              httpUploadService = new HttpUploadService(httpUploadUrl, maxFileSize);
+              Log.w(TAG, "max-file-size: " + maxFileSize);
+            }
+          }
+        }
+      }
+
+      Log.w(TAG, "isSmAvailable(): " + connection.isSmAvailable());
+      Log.w(TAG, "isSmEnabled(): " + connection.isSmEnabled());
+    } catch (Exception e) {
+      Log.w(TAG, e);
+      if (!isConnected()) {
+        instance.updateXmppStatus(XmppService.DISCONNECTED);
+        instance.displayFailureNotification();
+        try {
+          Thread.sleep(RECONNECTION_DELAY*1000);
+        } catch (Exception ex) {
+          Thread.currentThread().interrupt();
+        }
+        connect();
+      }
+    }
+  }
+
+  public void reconnect() {
+    if (connection != null && !connection.isAuthenticated() && getConnectionStatus().equals(DISCONNECTED)) {
+      new AsyncTask<Void, Void, Void>() {
+        @Override
+        protected Void doInBackground(Void... params) {
+          connect();
+          return null;
+        }
+      }.execute();
+    }
+  }
+
+  @Override
+  public void onDestroy() {
+    Log.w(TAG, "onDestroy()");
+    if (connection != null) connection.disconnect();
+    ServerPingWithAlarmManager.onDestroy();
+    instance = null;
+  }
+
+  @Override
+  public IBinder onBind(Intent intent) {
+    return null;
+  }
+
+  public static @Nullable XmppService getInstance() {
+    Log.w(TAG, "getInstance()");
+    return instance;
+  }
+
+  public Integer getConnectionStatus() {
+    return connectionStatus;
+  }
+
+  public boolean isConnected() {
+    return getConnectionStatus().equals(CONNECTED);
+  }
+
+  public void setHasBeenConnected() {
+    instance.hasBeenConnected = true;
+  }
+
+  public void setHasNotBeenConnected() {
+    instance.hasBeenConnected = false;
+  }
+
+  public boolean hasBeenConnected() {
+    Log.w(TAG, "hasBeenConnected(): " + instance.hasBeenConnected);
+    return instance.hasBeenConnected;
+  }
+
+  private void displayFailureNotification() {
+    if (!SilencePreferences.isXmppRegistered((Context) instance)) return;
+    if (!hasBeenConnected()) return;
+
+    NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
+
+    Intent       targetIntent = getPackageManager().getLaunchIntentForPackage(getPackageName());
+    Notification notification = new NotificationCompat.Builder(this)
+                                    .setSmallIcon(R.drawable.ic_warning_dark)
+                                    .setContentTitle(getString(R.string.XmppService_xmpp_connection_failed))
+                                    .setContentText(getString(R.string.XmppService_xmpp_features_in_silence_are_disabled))
+                                    .setAutoCancel(true)
+                                    .setContentIntent(PendingIntent.getActivity(this, 0,
+                                                                                targetIntent,
+                                                                                PendingIntent.FLAG_UPDATE_CURRENT))
+                                    .setPriority(Notification.PRIORITY_DEFAULT)
+                                    .build();
+
+    ServiceUtil.getNotificationManager(this).notify(SERVICE_RUNNING_ID, notification);
+  }
+
+  private boolean isXmppRecipient(Recipient recipient) {
+    return recipient.getXmppJid() != null;
+  }
+
+  public String send(String body, Recipient recipient)
+    throws UndeliverableMessageException
+  {
+    if (!isXmppRecipient(recipient)) throw new UndeliverableMessageException("JID for " + recipient.getNumber() + " is null");
+
+    ChatManager chatmanager = ChatManager.getInstanceFor(connection);
+    Chat        chat        = chatmanager.createChat(recipient.getXmppJid(), null);
+
+    try {
+      Message message = new Message(recipient.getXmppJid(), body);
+      String deliveryReceiptId = null;
+      if (SilencePreferences.isSmsDeliveryReportsEnabled(this)) {
+        deliveryReceiptId = DeliveryReceiptRequest.addTo(message);
+      }
+    	chat.sendMessage(message);
+      return deliveryReceiptId;
+    }
+    catch (Exception e) {
+    	throw new UndeliverableMessageException(e);
+    }
+  }
+
+  public void sendMedia(final MasterSecret masterSecret, String message, Attachment attachement, final long messageId, final Recipients recipients, final byte[] pduBytes)
+    throws UndeliverableMessageException
+  {
+    if (!isXmppRecipient(recipients.getPrimaryRecipient())) throw new UndeliverableMessageException("JID for " + recipients.getPrimaryRecipient().getNumber() + " is null");
+    if (httpUploadService == null) throw new UndeliverableMessageException("No upload service available");
+
+    final MediaType contentType = MediaType.parse(attachement.getContentType());
+
+    try {
+      if (contentType == null) throw new UndeliverableMessageException("Invalid Content-Type!");
+      Log.w(TAG, "length: " + pduBytes.length);
+      new XmppHttpUpload(connection).requestSlot(httpUploadService.getHostname(), messageId, pduBytes.length, attachement.getContentType(), new SlotGrantedListener() {
+        @Override
+        public void slotGranted(String put, String get){
+          sendFileAndNotify(masterSecret, messageId, pduBytes, contentType, recipients, put, get);
+        };
+
+        @Override
+        public void slotDenied(String error) {
+          Log.w(TAG, "Slot denied! " + error);
+          markFileAsErrored(messageId);
+        };
+      });
+    } catch(Exception e) {
+      throw new UndeliverableMessageException(e);
+    }
+  }
+
+  private void sendFileAndNotify(MasterSecret masterSecret, long messageId, byte[] pduBytes, MediaType contentType, Recipients recipients, String put, String get) {
+    Log.w(TAG, "sendFileAndNotify()");
+    Log.w(TAG, "Sending message ID " + messageId + " to " + put);
+
+    try {
+      MmsDatabase           mmsDatabase = DatabaseFactory.getMmsDatabase(instance);
+      EncryptingSmsDatabase smsDatabase = DatabaseFactory.getEncryptingSmsDatabase(instance);
+
+      OkHttpClient client = new OkHttpClient().newBuilder().connectTimeout(XMPP_SEND_MEDIA_TIMEOUT, TimeUnit.SECONDS)
+      .writeTimeout(XMPP_SEND_MEDIA_TIMEOUT, TimeUnit.SECONDS)
+      .readTimeout(XMPP_SEND_MEDIA_TIMEOUT, TimeUnit.SECONDS)
+      .build();
+
+      RequestBody body     = RequestBody.create(contentType, pduBytes);
+      Request     request  = new Request.Builder().header("User-Agent", USER_AGENT).url(put).put(body).build();
+      Response    response = client.newCall(request).execute();
+
+      if (response.code() == 200 || response.code() == 201) {
+        OutgoingTextMessage message = new SmsCipher(new SilenceAxolotlStore(instance, masterSecret)).encrypt(new OutgoingEncryptedMessage(recipients, get, -1));
+
+        MultipartSmsMessageHandler multipartMessageHandler = new MultipartSmsMessageHandler();
+        ArrayList<String>          messages                = multipartMessageHandler.divideMessage(message, true);
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String string : messages) {
+          stringBuilder.append(string.trim());
+        }
+
+        String deliveryReceiptId = send(stringBuilder.toString(), recipients.getPrimaryRecipient());
+        Log.w(TAG, "deliveryReceiptId: " + deliveryReceiptId);
+
+        smsDatabase.updateXmppId(messageId, deliveryReceiptId);
+        mmsDatabase.markAsSent(messageId);
+      } else {
+        Log.w(TAG, "Received " + response.code() + " code...");
+        markFileAsErrored(messageId);
+      }
+
+    } catch (Exception e) {
+      Log.w(TAG, e);
+      markFileAsErrored(messageId);
+    }
+
+
+  }
+
+  private void markFileAsErrored(long messageId) {
+    Log.w(TAG, "markFileAsErrored()");
+    MmsDatabase database = DatabaseFactory.getMmsDatabase(instance);
+    database.markAsSentFailed(messageId);
+    MmsSendJob.notifyMediaMessageDeliveryFailed(instance, messageId);
+  }
+
+  private void updateXmppStatus(Integer status) {
+    Integer oldStatus = getConnectionStatus();
+    connectionStatus = status;
+    if (hasBeenConnected()) broadcastXmppConnectivityEvent(this);
+  }
+
+  private static void broadcastXmppConnectivityEvent(Context context) {
+    Intent intent = new Intent(XMPP_CONNECTIVITY_EVENT);
+    intent.setPackage(context.getPackageName());
+    context.sendBroadcast(intent);
+  }
+
+  public void subscribe(String jid) {
+    Presence subscribe = new Presence(Presence.Type.subscribe);
+    subscribe.setTo(jid);
+    try {
+      connection.sendPacket(subscribe);
+    } catch (Exception e) {
+      Log.w(TAG, "Impossible NotConnectedException?");
+    }
+  }
+
+  public void deleteAccount() {
+
+    new AsyncTask<Void, Void, Void>() {
+      @Override
+      protected Void doInBackground(Void... params) {
+        if (connection != null) {
+          reconnectionManager.disableAutomaticReconnection();
+          AccountManager accountManager = AccountManager.getInstance(connection);
+          try {
+            accountManager.deleteAccount();
+          } catch (Exception e) {}
+          for (Recipient xmppRecipient : RecipientFactory.getXmppRecipients(instance, false)){
+            xmppRecipient.setXmppJid(null);
+          }
+          SilencePreferences.disableXmpp((Context) instance);
+          SilencePreferences.setXmppUsername((Context) instance, "");
+          SilencePreferences.setXmppPassword((Context) instance, "");
+          SilencePreferences.setXmppHostname((Context) instance, "");
+          SilencePreferences.setXmppPort((Context) instance, 0);
+          XmppUtil.stopService((Context) instance);
+        } else {
+          Log.w(TAG, "connection is null, cannot delete account");
+        }
+        return null;
+      }
+    }.execute();
+  }
+
+  public Presence getRecipientPresence(String jid) {
+    if (roster == null) {
+      Log.w(TAG, "Returning null Presence for " + jid);
+      return null;
+    }
+    return roster.getPresence(jid);
+  }
+
+  private class XmppServiceConnectionListener implements ConnectionListener {
+    private Context     context;
+    private XmppService instance;
+
+    public XmppServiceConnectionListener(XmppService instance) {
+      this.context  = (Context) instance;
+      this.instance = instance;
+    }
+
+    @Override
+    public void authenticated(XMPPConnection connection, boolean resumed) {
+      instance.setHasBeenConnected();
+      instance.updateXmppStatus(XmppService.CONNECTED);
+      ServiceUtil.getNotificationManager(context).cancel(XmppService.SERVICE_RUNNING_ID);
+    }
+
+    @Override
+    public void connected(XMPPConnection connection) {
+      ChatManager chatManager = ChatManager.getInstanceFor(connection);
+      if (chatManager.getChatListeners().size() < 1) {
+        chatManager.addChatListener(new ChatManagerListener() {
+          @Override
+          public void chatCreated(Chat chat, boolean createdLocally) {
+            if (!createdLocally) chat.addMessageListener(new XmppServiceChatMessageListener(context));
+          }
+        });
+      }
+    }
+
+    @Override
+    public void connectionClosed() {
+      Log.w(TAG, "connectionClosed()");
+
+      if (!SilencePreferences.isXmppRegistered(getApplicationContext())) {
+        Log.w(TAG, "Xmpp is disabled.");
+      } else {
+        instance.updateXmppStatus(XmppService.DISCONNECTED);
+        instance.displayFailureNotification();
+        instance.setHasNotBeenConnected();
+        connect();
+      }
+    }
+
+    @Override
+    public void connectionClosedOnError(Exception e) {
+      Log.w(TAG, "connectionClosedOnError()");
+      Log.w(TAG, e);
+
+      if (!SilencePreferences.isXmppRegistered(getApplicationContext())) {
+        Log.w(TAG, "Xmpp is disabled.");
+      } else {
+        instance.updateXmppStatus(XmppService.DISCONNECTED);
+        instance.displayFailureNotification();
+        instance.setHasNotBeenConnected();
+        connect();
+      }
+    }
+
+    @Override
+    public void reconnectingIn(int seconds) {
+      Log.w(TAG, "reconnectingIn(" + seconds + ")");
+    }
+
+    @Override
+    public void reconnectionFailed(Exception e) {
+      Log.w(TAG, "reconnectionFailed()");
+      instance.updateXmppStatus(XmppService.DISCONNECTED);
+    }
+
+    @Override
+    public void reconnectionSuccessful() {
+      Log.w(TAG, "reconnectionSuccessful()");
+      instance.updateXmppStatus(XmppService.CONNECTED);
+      ServiceUtil.getNotificationManager(context).cancel(XmppService.SERVICE_RUNNING_ID);
+    }
+  }
+
+  private class XmppServiceChatMessageListener implements ChatMessageListener {
+    private final Context context;
+
+    public XmppServiceChatMessageListener (Context context) {
+      Log.w(TAG, "Starting XMPP messages receiver...");
+      this.context = context;
+    }
+
+    @Override
+    public void processMessage(Chat chat, Message message){
+      String senderJid = chat.getParticipant().replaceAll("\\/.*$","");
+
+      Log.w(TAG, "Message recieved from " + senderJid);
+      ArrayList<String> xmpp = new ArrayList<String>();
+                        xmpp.add(senderJid);
+
+      Recipient sender = RecipientFactory.getRecipientsFromXmpp(context, xmpp, false).getPrimaryRecipient();
+      if (sender != null) {
+        for (Message.Body body : message.getBodies()) {
+          if (body.getMessage() != null) ApplicationContext.getInstance(context).getJobManager().add(new SmsReceiveJob(context, body.getMessage().trim(), sender.getNumber(), -1));
+        }
+      }
+    }
+  }
+
+  private class XmppServiceDeliveryReceiptDemandListener implements PacketListener {
+    XmppService instance;
+
+    public XmppServiceDeliveryReceiptDemandListener(XmppService instance) {
+      this.instance = instance;
+    }
+
+    @Override
+    public void processPacket(Stanza packet) {
+      if (packet instanceof Message && packet.getExtension("request", DeliveryReceipt.NAMESPACE) != null) {
+        try {
+          Message response = new Message(packet.getFrom().replaceAll("\\/.*$",""), Message.Type.normal);
+          response.addExtension(new DeliveryReceipt(packet.getPacketID()));
+          instance.connection.sendPacket(response);
+        } catch (Exception e) {
+          Log.w(TAG, e);
+        }
+      }
+    }
+  }
+
+  private class XmppServiceDeliveryReceiptListener implements ReceiptReceivedListener {
+    XmppService instance;
+
+    public XmppServiceDeliveryReceiptListener (XmppService instance) {
+      this.instance = instance;
+    }
+
+    @Override
+    public void onReceiptReceived(String fromJid, String toJid, String deliveryReceiptId, Stanza stanza) {
+      Log.d(TAG, "onReceiptReceived: from: " + fromJid + " to: " + toJid + " deliveryReceiptId: " + deliveryReceiptId + " stanza: " + stanza);
+      EncryptingSmsDatabase database = DatabaseFactory.getEncryptingSmsDatabase(instance);
+      long messageId = database.getMessageIdFromXmpp(deliveryReceiptId);
+      if (messageId > -1) {
+        ApplicationContext.getInstance(instance).getJobManager()
+                          .add(new SmsSentJob(instance, messageId, SmsDeliveryListener.DELIVERED_SMS_ACTION, Activity.RESULT_OK));
+
+      } else {
+        Log.w(TAG, "Received delivery receipt for an unknown message");
+      }
+    }
+  }
+
+  private class XmppRosterListener implements RosterListener {
+    private XmppService instance;
+
+    public XmppRosterListener (XmppService instance) {
+      this.instance = instance;
+    }
+
+    @Override
+    public void entriesAdded(Collection<String> addresses) {}
+
+    @Override
+    public void entriesDeleted(Collection<String> addresses) {}
+
+    @Override
+    public void entriesUpdated(Collection<String> addresses) {}
+
+    @Override
+    public void presenceChanged(Presence presence) {
+      instance.broadcastXmppConnectivityEvent((Context) instance);
+    }
+  }
+
+  public class IdleReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+    }
+  }
+
+  private class HttpUploadService {
+    private String hostname;
+    private long   maxFileSize;
+
+    public HttpUploadService(String hostname, long maxFileSize) {
+      this.hostname    = hostname;
+      this.maxFileSize = maxFileSize;
+    }
+
+    public String getHostname() {
+      return hostname;
+    }
+
+    public long getMaxFileSize() {
+      return maxFileSize;
+    }
+  }
+}
diff --git a/src/org/smssecure/smssecure/service/XmppServiceBoot.java b/src/org/smssecure/smssecure/service/XmppServiceBoot.java
new file mode 100644
index 000000000..fabb93b17
--- /dev/null
+++ b/src/org/smssecure/smssecure/service/XmppServiceBoot.java
@@ -0,0 +1,28 @@
+package org.smssecure.smssecure.service;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import org.smssecure.smssecure.util.XmppUtil;
+
+public class XmppServiceBoot extends BroadcastReceiver {
+  private static final String TAG = XmppServiceBoot.class.getSimpleName();
+
+  private static final String BOOT_COMPLETED_EVENT = "android.intent.action.BOOT_COMPLETED";
+
+  private Context context;
+
+  @Override
+  public void onReceive(final Context context, Intent intent) {
+    Log.w(TAG, "onReceive()");
+    this.context = context;
+
+    if (intent.getAction().equals(BOOT_COMPLETED_EVENT)) {
+      XmppUtil.startService(context);
+    } else {
+      throw new AssertionError("Unknown event passed to XmppServiceBoot");
+    }
+  }
+}
diff --git a/src/org/smssecure/smssecure/sms/IncomingTextMessage.java b/src/org/smssecure/smssecure/sms/IncomingTextMessage.java
index 9e961ce87..b1c90d3ae 100644
--- a/src/org/smssecure/smssecure/sms/IncomingTextMessage.java
+++ b/src/org/smssecure/smssecure/sms/IncomingTextMessage.java
@@ -32,7 +32,7 @@ public class IncomingTextMessage implements Parcelable {
   private final String  pseudoSubject;
   private final long    sentTimestampMillis;
   private final String  groupId;
-  private final boolean push;
+  private final boolean xmpp;
   private final int     subscriptionId;
   private final boolean receivedWhenLocked;
 
@@ -51,11 +51,15 @@ public class IncomingTextMessage implements Parcelable {
     this.sentTimestampMillis  = message.getTimestampMillis();
     this.subscriptionId       = subscriptionId;
     this.groupId              = null;
-    this.push                 = false;
+    this.xmpp                 = false;
     this.receivedWhenLocked   = receivedWhenLocked;
   }
 
   public IncomingTextMessage(String sender, int senderDeviceId, long sentTimestampMillis, String encodedBody) {
+    this(sender, senderDeviceId, sentTimestampMillis, encodedBody, false);
+  }
+
+  public IncomingTextMessage(String sender, int senderDeviceId, long sentTimestampMillis, String encodedBody, boolean receivedWhenLocked) {
     this.message              = encodedBody;
     this.sender               = sender;
     this.senderDeviceId       = senderDeviceId;
@@ -64,10 +68,10 @@ public class IncomingTextMessage implements Parcelable {
     this.replyPathPresent     = true;
     this.pseudoSubject        = "";
     this.sentTimestampMillis  = sentTimestampMillis;
-    this.push                 = true;
+    this.xmpp                 = true;
     this.subscriptionId       = -1;
-    this.groupId = null;
-    this.receivedWhenLocked   = false;
+    this.groupId              = null;
+    this.receivedWhenLocked   = receivedWhenLocked;
   }
 
   public IncomingTextMessage(Parcel in) {
@@ -80,7 +84,7 @@ public class IncomingTextMessage implements Parcelable {
     this.pseudoSubject        = in.readString();
     this.sentTimestampMillis  = in.readLong();
     this.groupId              = in.readString();
-    this.push                 = (in.readInt() == 1);
+    this.xmpp                 = (in.readInt() == 1);
     this.subscriptionId       = in.readInt();
     this.receivedWhenLocked   = (in.readInt() == 1);
   }
@@ -95,7 +99,7 @@ public class IncomingTextMessage implements Parcelable {
     this.pseudoSubject        = base.getPseudoSubject();
     this.sentTimestampMillis  = base.getSentTimestampMillis();
     this.groupId              = base.getGroupId();
-    this.push                 = base.isPush();
+    this.xmpp                 = base.isXmpp();
     this.subscriptionId       = base.getSubscriptionId();
     this.receivedWhenLocked   = base.isReceivedWhenLocked();
   }
@@ -116,7 +120,7 @@ public class IncomingTextMessage implements Parcelable {
     this.pseudoSubject        = fragments.get(0).getPseudoSubject();
     this.sentTimestampMillis  = fragments.get(0).getSentTimestampMillis();
     this.groupId              = fragments.get(0).getGroupId();
-    this.push                 = fragments.get(0).isPush();
+    this.xmpp                 = fragments.get(0).isXmpp();
     this.subscriptionId       = fragments.get(0).getSubscriptionId();
     this.receivedWhenLocked   = fragments.get(0).isReceivedWhenLocked();
   }
@@ -132,7 +136,7 @@ public class IncomingTextMessage implements Parcelable {
     this.pseudoSubject        = "";
     this.sentTimestampMillis  = System.currentTimeMillis();
     this.groupId              = groupId;
-    this.push                 = true;
+    this.xmpp                 = true;
     this.subscriptionId       = -1;
     this.receivedWhenLocked   = false;
   }
@@ -197,8 +201,8 @@ public class IncomingTextMessage implements Parcelable {
     return false;
   }
 
-  public boolean isPush() {
-    return push;
+  public boolean isXmpp() {
+    return xmpp;
   }
 
   public String getGroupId() {
@@ -229,7 +233,7 @@ public class IncomingTextMessage implements Parcelable {
     out.writeString(pseudoSubject);
     out.writeLong(sentTimestampMillis);
     out.writeString(groupId);
-    out.writeInt(push ? 1 : 0);
+    out.writeInt(xmpp ? 1 : 0);
     out.writeInt(subscriptionId);
     out.writeInt(receivedWhenLocked ? 1 : 0);
   }
diff --git a/src/org/smssecure/smssecure/sms/MessageSender.java b/src/org/smssecure/smssecure/sms/MessageSender.java
index f230d4221..d91ece97f 100644
--- a/src/org/smssecure/smssecure/sms/MessageSender.java
+++ b/src/org/smssecure/smssecure/sms/MessageSender.java
@@ -37,6 +37,7 @@ import org.smssecure.smssecure.util.GroupUtil;
 import org.smssecure.smssecure.util.InvalidNumberException;
 import org.smssecure.smssecure.util.SilencePreferences;
 import org.smssecure.smssecure.util.Util;
+import org.smssecure.smssecure.util.XmppUtil;
 import org.whispersystems.jobqueue.JobManager;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
@@ -48,15 +49,25 @@ public class MessageSender {
 
   private static final String TAG = MessageSender.class.getSimpleName();
 
+  public static long send(final Context context,
+                          final MasterSecret masterSecret,
+                          final OutgoingTextMessage message,
+                          final long threadId)
+  {
+    Recipient primaryRecipient = message.getRecipients() == null ? null : message.getRecipients().getPrimaryRecipient();
+    boolean   isXmppAvailable  = XmppUtil.isXmppAvailable(context) && primaryRecipient.getXmppJid() != null;
+
+    return send(context, masterSecret, message, threadId, isXmppAvailable);
+  }
+
   public static long send(final Context context,
                           final MasterSecret masterSecret,
                           final OutgoingTextMessage message,
                           final long threadId,
-                          final boolean forceSms)
+                          final boolean isXmpp)
   {
     EncryptingSmsDatabase database    = DatabaseFactory.getEncryptingSmsDatabase(context);
     Recipients            recipients  = message.getRecipients();
-    boolean               keyExchange = message.isKeyExchange();
 
     long allocatedThreadId;
 
@@ -66,7 +77,8 @@ public class MessageSender {
       allocatedThreadId = threadId;
     }
 
-    long messageId = database.insertMessageOutbox(masterSecret, allocatedThreadId, message, forceSms, System.currentTimeMillis());
+    long messageId = database.insertMessageOutbox(masterSecret, allocatedThreadId, message, System.currentTimeMillis());
+    if (isXmpp && !message.isXmppExchange()) database.markAsXmpp(messageId);
 
     sendTextMessage(context, recipients, messageId);
 
@@ -77,7 +89,7 @@ public class MessageSender {
                           final MasterSecret masterSecret,
                           final OutgoingMediaMessage message,
                           final long threadId,
-                          final boolean forceSms)
+                          final boolean isXmpp)
   {
     try {
       ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(context);
@@ -91,8 +103,8 @@ public class MessageSender {
         allocatedThreadId = threadId;
       }
 
-      Recipients recipients = message.getRecipients();
-      long       messageId  = database.insertMessageOutbox(masterSecret, message, allocatedThreadId, forceSms);
+      long messageId = database.insertMessageOutbox(masterSecret, message, allocatedThreadId);
+      if (isXmpp) database.markAsXmpp(messageId);
 
       sendMediaMessage(context, messageId);
 
diff --git a/src/org/smssecure/smssecure/sms/MultipartSmsMessageHandler.java b/src/org/smssecure/smssecure/sms/MultipartSmsMessageHandler.java
index c944dae16..2e88a0ec5 100644
--- a/src/org/smssecure/smssecure/sms/MultipartSmsMessageHandler.java
+++ b/src/org/smssecure/smssecure/sms/MultipartSmsMessageHandler.java
@@ -94,9 +94,9 @@ public class MultipartSmsMessageHandler {
     }
   }
 
-  public synchronized ArrayList<String> divideMessage(OutgoingTextMessage message) {
+  public synchronized ArrayList<String> divideMessage(OutgoingTextMessage message, boolean isXmpp) {
     String number     = message.getRecipients().getPrimaryRecipient().getNumber();
     byte   identifier = MultipartSmsIdentifier.getInstance().getIdForRecipient(number);
-    return MultipartSmsTransportMessage.getEncoded(message, identifier);
+    return MultipartSmsTransportMessage.getEncoded(message, identifier, isXmpp);
   }
 }
diff --git a/src/org/smssecure/smssecure/sms/MultipartSmsTransportMessage.java b/src/org/smssecure/smssecure/sms/MultipartSmsTransportMessage.java
index d9dcf9e42..170539ab9 100644
--- a/src/org/smssecure/smssecure/sms/MultipartSmsTransportMessage.java
+++ b/src/org/smssecure/smssecure/sms/MultipartSmsTransportMessage.java
@@ -154,7 +154,7 @@ public class MultipartSmsTransportMessage {
     return message;
   }
 
-  public static ArrayList<String> getEncoded(OutgoingTextMessage message, byte identifier)
+  public static ArrayList<String> getEncoded(OutgoingTextMessage message, byte identifier, boolean isXmpp)
   {
     try {
       byte[] decoded = Base64.decodeWithoutPadding(message.getMessageBody());
@@ -165,10 +165,11 @@ public class MultipartSmsTransportMessage {
       if      (message.isKeyExchange())  prefix = new KeyExchangeWirePrefix();
       else if (message.isPreKeyBundle()) prefix = new PrekeyBundleWirePrefix();
       else if (message.isEndSession())   prefix = new EndSessionWirePrefix();
+      else if (message.isXmppExchange()) prefix = new XmppExchangeWirePrefix();
       else                               prefix = new SecureMessageWirePrefix();
 
-      if (count == 1) return getSingleEncoded(decoded, prefix);
-      else            return getMultiEncoded(decoded, prefix, count, identifier);
+      if (count == 1 || isXmpp) return getSingleEncoded(decoded, prefix);
+      else                      return getMultiEncoded(decoded, prefix, count, identifier);
 
     } catch (IOException e) {
       throw new AssertionError(e);
diff --git a/src/org/smssecure/smssecure/sms/OutgoingTextMessage.java b/src/org/smssecure/smssecure/sms/OutgoingTextMessage.java
index 0257d1c59..7e6d70b73 100644
--- a/src/org/smssecure/smssecure/sms/OutgoingTextMessage.java
+++ b/src/org/smssecure/smssecure/sms/OutgoingTextMessage.java
@@ -49,9 +49,15 @@ public class OutgoingTextMessage {
     return false;
   }
 
+  public boolean isXmppExchange() {
+    return false;
+  }
+
   public static OutgoingTextMessage from(SmsMessageRecord record) {
     if (record.isSecure()) {
       return new OutgoingEncryptedMessage(record.getRecipients(), record.getBody().getBody(), record.getSubscriptionId());
+    } else if (record.isXmppExchange()) {
+      return new OutgoingXmppExchangeMessage(record.getRecipients(), record.getBody().getBody(), record.getSubscriptionId());
     } else if (record.isKeyExchange()) {
       return new OutgoingKeyExchangeMessage(record.getRecipients(), record.getBody().getBody(), record.getSubscriptionId());
     } else if (record.isEndSession()) {
diff --git a/src/org/smssecure/smssecure/sms/OutgoingXmppExchangeMessage.java b/src/org/smssecure/smssecure/sms/OutgoingXmppExchangeMessage.java
new file mode 100644
index 000000000..c6305fed6
--- /dev/null
+++ b/src/org/smssecure/smssecure/sms/OutgoingXmppExchangeMessage.java
@@ -0,0 +1,28 @@
+package org.smssecure.smssecure.sms;
+
+import org.smssecure.smssecure.recipients.Recipients;
+
+public class OutgoingXmppExchangeMessage extends OutgoingTextMessage {
+
+  public OutgoingXmppExchangeMessage(OutgoingTextMessage base) {
+    this(base, base.getMessageBody());
+  }
+
+  public OutgoingXmppExchangeMessage(OutgoingTextMessage message, String body) {
+    super(message, body);
+  }
+
+  public OutgoingXmppExchangeMessage(Recipients recipients, String message, int subscriptionId) {
+    super(recipients, message, subscriptionId);
+  }
+
+  @Override
+  public boolean isXmppExchange() {
+    return true;
+  }
+
+  @Override
+  public OutgoingTextMessage withBody(String body) {
+    return new OutgoingXmppExchangeMessage(this, body);
+  }
+}
diff --git a/src/org/smssecure/smssecure/util/ServiceUtil.java b/src/org/smssecure/smssecure/util/ServiceUtil.java
index 8c7ce73c3..b99f77d7a 100644
--- a/src/org/smssecure/smssecure/util/ServiceUtil.java
+++ b/src/org/smssecure/smssecure/util/ServiceUtil.java
@@ -1,7 +1,9 @@
 package org.smssecure.smssecure.util;
 
 import android.app.Activity;
+import android.app.AlarmManager;
 import android.app.NotificationManager;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
@@ -33,4 +35,12 @@ public class ServiceUtil {
   public static AudioManager getAudioManager(Context context) {
     return (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
   }
+
+  public static ClipboardManager getClipboardManager(Context context) {
+    return (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+  }
+
+  public static AlarmManager getAlarmManager(Context context) {
+    return (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+  }
 }
diff --git a/src/org/smssecure/smssecure/util/SilencePreferences.java b/src/org/smssecure/smssecure/util/SilencePreferences.java
index a251a8c6d..fdf6aeadd 100644
--- a/src/org/smssecure/smssecure/util/SilencePreferences.java
+++ b/src/org/smssecure/smssecure/util/SilencePreferences.java
@@ -95,6 +95,15 @@ public class SilencePreferences {
   private static final String MEDIA_DOWNLOAD_PREF              = "pref_media_download";
   private static final String MEDIA_DOWNLOAD_ROAMING_PREF      = "pref_media_download_roaming";
 
+  public  static final String XMPP_STATUS                      = "pref_xmpp_status";
+  public  static final String XMPP_ENABLED_PREF                = "pref_xmpp_enabled";
+  private static final String XMPP_USERNAME_PREF               = "pref_xmpp_username";
+  private static final String XMPP_PASSWORD_PREF               = "pref_xmpp_password";
+  private static final String XMPP_HOSTNAME_PREF               = "pref_xmpp_hostname";
+  private static final String XMPP_PORT_PREF                   = "pref_xmpp_port";
+  public  static final String XMPP_NOTIFY_CONTACTS             = "pref_xmpp_notify";
+  private static final String XMPP_FORCE                       = "pref_xmpp_force";
+
   public static NotificationPrivacyPreference getNotificationPrivacy(Context context) {
     return new NotificationPrivacyPreference(getStringPreference(context, NOTIFICATION_PRIVACY_PREF, "all"));
   }
@@ -542,6 +551,67 @@ public class SilencePreferences {
     return getBooleanPreference(context, SHOW_SENT_TIME, false);
   }
 
+  public static boolean isXmppRegistered(Context context) {
+    return isXmppEnabled(context)         &&
+           getXmppUsername(context) != "" &&
+           getXmppPassword(context) != "" &&
+           getXmppHostname(context) != "" &&
+           getXmppPort(context)     != 0;
+  }
+
+  public static boolean isXmppEnabled(Context context) {
+    return getBooleanPreference(context, XMPP_ENABLED_PREF, false);
+  }
+
+  public static void enableXmpp(Context context) {
+    setBooleanPreference(context, XMPP_ENABLED_PREF, true);
+  }
+
+  public static void disableXmpp(Context context) {
+    setBooleanPreference(context, XMPP_ENABLED_PREF, false);
+  }
+
+  public static String getXmppJid(Context context) {
+    String xmppJid = getXmppUsername(context) + "@" + getXmppHostname(context);
+    return xmppJid.equals("@") ? "" : xmppJid;
+  }
+
+  public static String getXmppUsername(Context context) {
+    return getStringPreference(context, XMPP_USERNAME_PREF, "");
+  }
+
+  public static String getXmppPassword(Context context) {
+    return getStringPreference(context, XMPP_PASSWORD_PREF, "");
+  }
+
+  public static String getXmppHostname(Context context) {
+    return getStringPreference(context, XMPP_HOSTNAME_PREF, "");
+  }
+
+  public static int getXmppPort(Context context) {
+    return getIntegerPreference(context, XMPP_PORT_PREF, 0);
+  }
+
+  public static void setXmppUsername(Context context, String username) {
+    setStringPreference(context, XMPP_USERNAME_PREF, username);
+  }
+
+  public static void setXmppPassword(Context context, String password) {
+    setStringPreference(context, XMPP_PASSWORD_PREF, password);
+  }
+
+  public static void setXmppHostname(Context context, String hostname) {
+    setStringPreference(context, XMPP_HOSTNAME_PREF, hostname);
+  }
+
+  public static void setXmppPort(Context context, int port) {
+    setIntegerPrefrence(context, XMPP_PORT_PREF, port);
+  }
+
+  public static boolean isXmppForced(Context context) {
+    return getBooleanPreference(context, XMPP_FORCE, false);
+  }
+
   public static void setBooleanPreference(Context context, String key, boolean value) {
     PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply();
   }
diff --git a/src/org/smssecure/smssecure/util/XmppCharacterCalculator.java b/src/org/smssecure/smssecure/util/XmppCharacterCalculator.java
new file mode 100644
index 000000000..b5c6628cb
--- /dev/null
+++ b/src/org/smssecure/smssecure/util/XmppCharacterCalculator.java
@@ -0,0 +1,9 @@
+package org.smssecure.smssecure.util;
+
+public class XmppCharacterCalculator extends CharacterCalculator {
+  private static final int MAX_SIZE = 2000;
+  @Override
+  public CharacterState calculateCharacters(String messageBody) {
+    return new CharacterState(1, MAX_SIZE - messageBody.length(), MAX_SIZE);
+  }
+}
diff --git a/src/org/smssecure/smssecure/util/XmppUtil.java b/src/org/smssecure/smssecure/util/XmppUtil.java
new file mode 100644
index 000000000..36130de32
--- /dev/null
+++ b/src/org/smssecure/smssecure/util/XmppUtil.java
@@ -0,0 +1,240 @@
+package org.smssecure.smssecure.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import org.smssecure.smssecure.crypto.MasterSecret;
+import org.smssecure.smssecure.R;
+import org.smssecure.smssecure.recipients.RecipientFactory;
+import org.smssecure.smssecure.recipients.Recipient;
+import org.smssecure.smssecure.recipients.Recipients;
+import org.smssecure.smssecure.service.KeyCachingService;
+import org.smssecure.smssecure.service.XmppService;
+import org.smssecure.smssecure.sms.MessageSender;
+import org.smssecure.smssecure.sms.OutgoingTextMessage;
+import org.smssecure.smssecure.sms.OutgoingXmppExchangeMessage;
+import org.smssecure.smssecure.util.Base64;
+import org.smssecure.smssecure.util.dualsim.SubscriptionManagerCompat;
+import org.smssecure.smssecure.util.SilencePreferences;
+
+import org.jivesoftware.smack.ConnectionConfiguration;
+import org.jivesoftware.smack.SmackException;
+import org.jivesoftware.smack.tcp.XMPPTCPConnection;
+import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smackx.iqregister.AccountManager;
+
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Random;
+import java.util.UUID;
+
+public class XmppUtil {
+  private static final String TAG = XmppUtil.class.getSimpleName();
+
+  public  static Integer XMPP_TIMEOUT        = 10000; // 10s
+  public  static Integer XMPP_STANZA_TIMEOUT = 30000; // 30s
+  private static ArrayList<XmppServer> xmppServers = new ArrayList<XmppServer>() {
+    {
+      add(new XmppServer("xmpp.ams1.silence.im"));
+    }
+  };
+
+  public static void tryToRegister(Context context, ArrayList<XmppServer> serversToTest)
+    throws Exception
+  {
+    if (!SilencePreferences.isXmppRegistered(context)) {
+      if (serversToTest.size() <= 0) throw new Exception("No more XMPP server available");
+
+      Random random = new Random();
+      Integer randomInt = random.nextInt(serversToTest.size());
+      XmppServer xmppServerToRegister = serversToTest.get(randomInt);
+      Log.w(TAG, "Registering on server " + xmppServerToRegister.getHostname());
+      try {
+        register(context, xmppServerToRegister);
+      } catch (Exception e) {
+        Log.w(TAG, e);
+        serversToTest.remove(xmppServerToRegister);
+        tryToRegister(context, serversToTest);
+      }
+      SilencePreferences.enableXmpp(context);
+      startService(context);
+    }
+  }
+
+  public static void tryToRegister(Context context)
+    throws Exception
+  {
+    tryToRegister(context, new ArrayList<XmppServer>(getXmppServers()));
+  }
+
+  public static void register(Context context, XmppServer xmppServerToRegister)
+    throws IOException, SmackException, SmackException.NoResponseException, XMPPException, XMPPException.XMPPErrorException
+  {
+    if (!SilencePreferences.isXmppRegistered(context)) {
+      stopService(context);
+
+      String uuid = UUID.randomUUID().toString();
+      String password;
+      try {
+        SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+        byte[] salt               = new byte[64];
+        secureRandom.nextBytes(salt);
+        password = Base64.encodeBytes(salt).replaceAll("[=*$]","");
+      } catch (Exception e) {
+        Log.w(TAG, e);
+        throw new AssertionError(e);
+      }
+
+      Log.w(TAG, "Registering with UUID " + uuid);
+
+      XMPPTCPConnectionConfiguration.Builder configBuilder = getConfigBuilder(context);
+      configBuilder.setServiceName(xmppServerToRegister.getHostname())
+                   .setPort(xmppServerToRegister.getPort());
+      XMPPTCPConnection connection = new XMPPTCPConnection(configBuilder.build());
+      connection.setPacketReplyTimeout(XMPP_STANZA_TIMEOUT);
+      connection.connect();
+
+      AccountManager accountManager = AccountManager.getInstance(connection);
+      if (!accountManager.supportsAccountCreation()) {
+        throw new UnsupportedOperationException("Account registation is not supported");
+      }
+      if (accountManager.getAccountAttributes().size() > 2) {
+        throw new UnsupportedOperationException("Anonymous account registation is not supported");
+      }
+      accountManager.createAccount(uuid, password);
+
+      SilencePreferences.setXmppUsername(context, uuid);
+      SilencePreferences.setXmppPassword(context, password);
+      SilencePreferences.setXmppHostname(context, xmppServerToRegister.getHostname());
+      SilencePreferences.setXmppPort(context, xmppServerToRegister.getPort());
+
+      connection.disconnect();
+    }
+  }
+
+  public static XMPPTCPConnectionConfiguration.Builder getConfigBuilder(Context context) {
+    XMPPTCPConnectionConfiguration.Builder configBuilder = XMPPTCPConnectionConfiguration.builder();
+    configBuilder.setResource(context.getString(R.string.app_name))
+                 .setSecurityMode(ConnectionConfiguration.SecurityMode.required)
+                 .setEnabledSSLProtocols(new String[] { "TLSv1",  "TLSv1.1", "TLSv1.2" })
+                 .setConnectTimeout(XMPP_TIMEOUT)
+                 .setDebuggerEnabled(false);
+    return configBuilder;
+  }
+
+  public static void startService(Context context) {
+    Log.w(TAG, "startService()");
+
+    if (XmppService.getInstance() == null) {
+      Log.w(TAG, "Starting service...");
+      context.startService(new Intent(context, XmppService.class));
+    }
+  }
+
+  public static void stopService(Context context) {
+    context.stopService(new Intent(context, XmppService.class));
+  }
+
+  public static @NonNull ArrayList<XmppServer> getXmppServers() {
+    return xmppServers;
+  }
+
+  public static @Nullable XmppServer getRegisteredServer(Context context) {
+    if (SilencePreferences.isXmppRegistered(context)) {
+      return new XmppServer(SilencePreferences.getXmppUsername(context),
+                            SilencePreferences.getXmppPassword(context),
+                            SilencePreferences.getXmppHostname(context),
+                            SilencePreferences.getXmppPort(context));
+    } else {
+      return null;
+    }
+  }
+
+  public static boolean isXmppAvailable(Context context) {
+    XmppService instance = XmppService.getInstance();
+    return SilencePreferences.isXmppRegistered(context) &&
+           instance != null                             &&
+           instance.isConnected();
+  }
+
+  public static void sendNullXmppMessage(final Context context) {
+    MasterSecret masterSecret = KeyCachingService.getMasterSecret(context);
+    if (masterSecret == null) throw new AssertionError("null masterSecret");
+
+    new AsyncTask<MasterSecret, Void, Void>() {
+      @Override
+      protected Void doInBackground(MasterSecret... params) {
+        for (Recipient recipient : RecipientFactory.getXmppRecipients(context, false)) {
+          Recipients recipients = RecipientFactory.getRecipientsFor(context, recipient, false);
+          OutgoingXmppExchangeMessage xmppExchangeMessage =
+              new OutgoingXmppExchangeMessage(recipients, "NULL", SubscriptionManagerCompat.getDefaultMessagingSubscriptionId().or(-1));
+          MessageSender.send(context, params[0], xmppExchangeMessage, -1, false);
+        }
+
+        return null;
+      }
+    }.execute(masterSecret);
+  }
+
+  public static class XmppServer {
+    private String  username;
+    private String  password;
+    private String  hostname;
+    private Integer port;
+
+    public XmppServer(String username, String password, String hostname, Integer port){
+      this.username = username;
+      this.password = password;
+      this.hostname = hostname;
+      this.port = port;
+    }
+
+    public XmppServer(String username, String password, String hostname){
+      this.username = username;
+      this.password = password;
+      this.hostname = hostname;
+      this.port = 5222;
+    }
+
+    public XmppServer(String hostname, Integer port) {
+      this.username = null;
+      this.password = null;
+      this.hostname = hostname;
+      this.port = port;
+    }
+
+    public XmppServer(String hostname) {
+      this.hostname = hostname;
+      this.port = 5222;
+    }
+
+    public String getUsername() {
+      return this.username;
+    }
+
+    public String getPassword() {
+      return this.password;
+    }
+
+    public String getHostname() {
+      return this.hostname;
+    }
+
+    public Integer getPort() {
+      return this.port;
+    }
+
+    public String toString() {
+      return this.hostname + ":" + this.port;
+    }
+  }
+
+}
-- 
GitLab