--- a/AndroidManifest.xml	Tue Jun 02 17:49:09 2009 +0200
+++ b/AndroidManifest.xml	Wed Jun 17 18:14:08 2009 +0200
@@ -3,10 +3,9 @@
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
 	<application android:label="@string/app_name" android:name="BeemApplication"
-		android:icon="@drawable/signal"
-		android:theme="@style/Theme.BEEM.Default">
+		android:icon="@drawable/signal" android:theme="@style/Theme.BEEM.Default">
 		<activity android:name=".ui.Login" android:label="@string/app_name"
-			android:launchMode="singleTop">
+			android:launchMode="singleTask">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -14,17 +13,19 @@
 		</activity>
 		<activity android:name=".ui.ContactListSettings"
 			android:label="@string/app_name" />
-		<activity android:name=".ui.SendIM" android:label="@string/SendIMActTitle" android:launchMode="singleTop" />
+		<activity android:name=".ui.SendIM" android:label="@string/SendIMActTitle"
+			android:launchMode="singleTop" />
 		<activity android:name=".ui.ChangeStatus" android:label="@string/ChangeStatusActTitle" />
 		<activity android:name=".ui.AccountCreation" android:label="@string/app_name" />
 		<activity android:name=".ui.AddContact" android:label="@string/AddCActTitle" />
 		<activity android:name=".ui.Subscription" android:label="@string/app_name" />
-        <activity android:name=".ui.EditSettings" android:label="@string/edit_settings_name">
-        </activity>
-        <activity android:name=".ui.CreateAccount" android:label="@string/create_account_name">
-        </activity>
-        <activity android:name=".ui.ContactList" android:label="@string/contact_list_name">
-        </activity>
+		<activity android:name=".ui.EditSettings" android:label="@string/edit_settings_name">
+		</activity>
+		<activity android:name=".ui.CreateAccount" android:label="@string/create_account_name">
+		</activity>
+		<activity android:name=".ui.ContactList" android:label="@string/contact_list_name"
+			android:launchMode="singleTask">
+		</activity>
 		<service android:name="BeemService" android:enabled="true"
 			android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE">
 			<intent-filter>