diff -r 85a46554a5d5 -r b8e23e8da2f7 AndroidManifest.xml
--- a/AndroidManifest.xml	Thu Feb 23 13:15:47 2012 +0100
+++ b/AndroidManifest.xml	Tue Apr 10 11:32:31 2012 +0200
@@ -5,34 +5,34 @@
     android:versionName="0.1.5" >
 
     <application
+        android:name=".BeemApplication"
         android:icon="@drawable/beem_launcher_icon_silver"
         android:label="@string/app_name"
-        android:name=".BeemApplication"
         android:theme="@style/Theme.BEEM.Default" >
         <activity
+            android:name=".ui.Login"
             android:label="@string/app_name"
-            android:launchMode="standard"
-            android:name=".ui.Login" >
-            <intent-filter >
+            android:launchMode="standard" >
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:label="Account wizard"
-            android:name=".ui.wizard.Account" />
+            android:name=".ui.wizard.Account"
+            android:label="Account wizard" />
         <activity
-            android:label="Account wizard"
-            android:name=".ui.wizard.AccountConfigure" />
+            android:name=".ui.wizard.AccountConfigure"
+            android:label="Account wizard" />
         <activity
+            android:name=".ui.LoginAnim"
             android:label="@string/login_login_progress"
             android:launchMode="singleTop"
-            android:name=".ui.LoginAnim"
             android:screenOrientation="portrait" />
         <activity
-            android:label="@string/edit_settings_name"
-            android:name=".ui.Settings" >
+            android:name=".ui.Settings"
+            android:label="@string/edit_settings_name" >
             <intent-filter android:label="Beem Android Account" >
                 <action android:name="com.beem.project.beem.SETTINGS" />
 
@@ -43,13 +43,13 @@
             </intent-filter>
         </activity>
         <activity
+            android:name=".ui.Chat"
             android:label="@string/chat_name"
-            android:launchMode="singleTop"
-            android:name=".ui.Chat" >
+            android:launchMode="singleTop" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
             </intent-filter>
-            <intent-filter >
+            <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -57,7 +57,7 @@
 
                 <data android:scheme="im" />
             </intent-filter>
-            <intent-filter >
+            <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -68,17 +68,17 @@
             </intent-filter>
         </activity>
         <activity
+            android:name=".ui.MucChat"
             android:label="@string/chat_name"
-            android:launchMode="singleTop"
-            android:name=".ui.MucChat" >
+            android:launchMode="singleTop" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
             </intent-filter>
         </activity>
         <activity
+            android:name=".ui.ChangeStatus"
             android:label="@string/ChangeStatusActTitle"
             android:launchMode="singleTask"
-            android:name=".ui.ChangeStatus"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter android:label="Beem Android Account" >
                 <action android:name="com.beem.project.beem.CHANGESTATUS" />
@@ -90,8 +90,8 @@
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/AddCActTitle"
-            android:name=".ui.AddContact" >
+            android:name=".ui.AddContact"
+            android:label="@string/AddCActTitle" >
             <intent-filter android:label="Create Contact" >
                 <action android:name="android.intent.action.INSERT" />
 
@@ -103,40 +103,44 @@
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/app_name"
-            android:name=".ui.Subscription" >
+            android:name=".ui.AddMuc"
+            android:label="@string/AddMucTitle" >
+        </activity>
+        <activity
+            android:name=".ui.Subscription"
+            android:label="@string/app_name" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/create_account_name"
-            android:name=".ui.CreateAccount" />
+            android:name=".ui.CreateAccount"
+            android:label="@string/create_account_name" />
         <activity
+            android:name=".ui.ContactList"
             android:label="@string/contact_list_name"
-            android:launchMode="singleTask"
-            android:name=".ui.ContactList" >
+            android:launchMode="singleTask" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
             </intent-filter>
         </activity>
         <activity
-            android:label="GroupList"
-            android:name=".ui.GroupList" >
+            android:name=".ui.GroupList"
+            android:label="GroupList" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
             </intent-filter>
         </activity>
         <activity
-            android:label="@string/privacy_list_name"
-            android:name=".ui.PrivacyList" >
+            android:name=".ui.PrivacyList"
+            android:label="@string/privacy_list_name" >
             <intent-filter android:label="Beem Connection" >
                 <action android:name="com.beem.project.beem.service.XmppConnectionAdapter.CONNECTION_CLOSED" />
             </intent-filter>
         </activity>
         <activity
-            android:label="Sync Settings"
-            android:name="com.beem.project.beem.account.ManageAccountsSettings" >
+            android:name="com.beem.project.beem.account.ManageAccountsSettings"
+            android:label="Sync Settings" >
         </activity>
         <!--
 			Could be interesting if we would launch beem at startup <receiver
@@ -146,24 +150,24 @@
 			</intent-filter> </receiver>
         -->
         <provider
+            android:name=".providers.AvatarProvider"
             android:authorities="com.beem.project.beem.providers.avatarprovider"
             android:exported="false"
-            android:label="Avatar Provider"
-            android:name=".providers.AvatarProvider" />
+            android:label="Avatar Provider" />
         <provider
+            android:name=".providers.MessageProvider"
             android:authorities="com.beem.project.beem.providers.messageprovider"
-            android:label="Message Provider"
-            android:name=".providers.MessageProvider" />
+            android:label="Message Provider" />
         <provider
+            android:name=".providers.MUCsProvider"
             android:authorities="com.beem.project.beem.providers.mucsprovider"
-            android:label="MUCs Provider"
-            android:name=".providers.MUCsProvider" />
+            android:label="MUCs Provider" />
 
         <service
+            android:name=".account.AuthenticatorService"
             android:exported="true"
-            android:name=".account.AuthenticatorService"
             android:process=":auth" >
-            <intent-filter >
+            <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
 
@@ -172,10 +176,10 @@
                 android:resource="@xml/authenticator" />
         </service>
         <service
+            android:name=".account.SyncAdapterService"
             android:exported="true"
-            android:name=".account.SyncAdapterService"
             android:process=":contacts" >
-            <intent-filter >
+            <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
 
@@ -187,15 +191,11 @@
                 android:resource="@xml/contacts" />
         </service>
         <service
+            android:name="BeemService"
             android:enabled="true"
             android:label="Beem Service"
-            android:name="BeemService"
             android:permission="com.beem.project.beem.BEEM_SERVICE" >
-            <intent-filter >
-                <action android:name="com.beem.project.beem.BeemService" >
-                </action>
-            </intent-filter>
-            <intent-filter >
+            <intent-filter>
                 <action android:name="com.beem.project.beem.BeemService" />
                 <action android:name="com.beem.project.beem.intent.action.SYNC" />
                 <action android:name="com.beem.project.beem.intent.action.CONNECT" />
@@ -206,14 +206,15 @@
                 <action android:name="com.beem.project.beem.intent.action.CHANGE_STATUS" />
                 <action android:name="com.beem.project.beem.intent.action.MUC_JOIN" />
                 <action android:name="com.beem.project.beem.intent.action.MUC_SEND_MESSAGE" />
+                <action android:name="com.beem.project.beem.intent.action.ADD_MUC" />
             </intent-filter>
         </service>
     </application>
 
     <permission
+        android:name="com.beem.project.beem.BEEM_SERVICE"
         android:description="@string/BeemServiceDescription"
         android:label="BeemService"
-        android:name="com.beem.project.beem.BEEM_SERVICE"
         android:permissionGroup="android.permission-group.NETWORK" />
 
     <uses-permission android:name="android.permission.INTERNET" />