--- a/res/layout/preferences.xml	Mon May 10 20:13:12 2010 +0200
+++ b/res/layout/preferences.xml	Sat May 15 14:36:13 2010 +0200
@@ -25,11 +25,11 @@
 				android:hint="@string/away_message_hint" />
 		</PreferenceScreen>
 		<PreferenceScreen android:title="@string/notification_preferences">
-			<CheckBoxPreference android:title="@string/notification_disable_vibrate_title"
-				android:defaultValue="false" android:summary="@string/notification_disable_vibrate_sum"
-				android:key="settings_notification_disable_vibrate" />
+			<CheckBoxPreference android:title="@string/notification_enable_vibrate_title"
+				android:defaultValue="false" android:summary="@string/notification_enable_vibrate_sum"
+				android:key="notification_vibrate" />
 			<RingtonePreference
-				android:title="@string/notification_snd_title" android:key="settings_notification_snd"
+				android:title="@string/notification_snd_title" android:key="notification_sound"
 				android:summary="@string/notification_snd_sum" android:ringtoneType="notification"
 				android:showDefault="true" />
 		</PreferenceScreen>

--- a/res/values-de/strings.xml	Mon May 10 20:13:12 2010 +0200
+++ b/res/values-de/strings.xml	Sat May 15 14:36:13 2010 +0200
@@ -21,11 +21,6 @@
 	<string name="BeemServiceCreated">Beem Service erstellt</string>
 	<string name="BeemServiceDestroyed">Beem Service verworfen</string>
 
-	<!--  Preferences informations -->
-	<string name="PreferenceStatus">Status</string>
-	<string name="PreferenceStatusText">status_text</string>
-	<string name="PreferenceIsConfigured">preference_is_configured	</string>
-
 	<!-- ContactListSettings class -->
 	<string name="CLSServerConnection">Server Verbindung</string>
 	<string name="CLSUserid">Benutzer id:</string>
@@ -122,8 +117,8 @@
 	<string name="away_message_sum">Angezeigte Abwesendheitsnachricht</string>
 	<string name="away_message_hint">Ich bin abwesend, mein Telefonbildschirm ist aus</string>
 	<string name="notification_preferences">Benachrichtigungseinstellungen</string>
-	<string name="notification_disable_vibrate_title">Vibrieren</string>
-	<string name="notification_disable_vibrate_sum">Deaktivieren Sie vibriert bei eingehenden Nachrichten</string>
+	<string name="notification_enable_vibrate_title">Vibrieren</string>
+	<string name="notification_enable_vibrate_sum">Aktivieren Sie vibriert bei eingehenden Nachrichten</string>
 	<string name="notification_snd_title">Nachrichtensignalton</string>
 	<string name="notification_snd_sum">Lege den Signalton für eingehende Nachrichten fest</string>
 

--- a/res/values-fr/strings.xml	Mon May 10 20:13:12 2010 +0200
+++ b/res/values-fr/strings.xml	Sat May 15 14:36:13 2010 +0200
@@ -119,8 +119,8 @@
 	<string name="away_message_sum">Votre Message d\'absence</string>
 	<string name="away_message_hint">Je suis absent car mon ecran est éteind</string>
 	<string name="notification_preferences">Paramètres des notifications</string>
-	<string name="notification_disable_vibrate_title">Vibreur</string>
-	<string name="notification_disable_vibrate_sum">Désactiver le vibreur pour les messages entrants</string>
+	<string name="notification_enable_vibrate_title">Activer le vibreur</string>
+	<string name="notification_enable_vibrate_sum">Activer le vibreur pour les messages entrants</string>
 	<string name="notification_snd_title">Sonnerie des messages</string>
 	<string name="notification_snd_sum">Configurer la sonnerie des messages entrants</string>
 	

--- a/res/values-ru/strings.xml	Mon May 10 20:13:12 2010 +0200
+++ b/res/values-ru/strings.xml	Sat May 15 14:36:13 2010 +0200
@@ -21,12 +21,6 @@
 <string name="BeemServiceCreated"></string>
 <string name="BeemServiceDestroyed"></string>
 
-<!--  Preferences informations -->
-<string name="PreferenceStatus">Статус</string>
-<string name="PreferenceStatusText"></string>
-<string name="PreferenceIsConfigured">preference_is_configured
-</string>
-
 <!-- ContactListSettings class -->
 <string name="CLSServerConnection">Соединение</string>
 <string name="CLSUserid">Имя пользователя:</string>
@@ -125,8 +119,8 @@
 <string name="away_message_sum"></string>
 <string name="away_message_hint"></string>
 <string name="notification_preferences">Настройка оповещений</string>
-<string name="notification_disable_vibrate_title">Вибрация</string>
-<string name="notification_disable_vibrate_sum">Отключить вибрировать на входящие сообщения</string>
+<string name="notification_enable_vibrate_title">Вибрация</string>
+<string name="notification_enable_vibrate_sum">Активировать вибрировать на входящие сообщения</string>
 <string name="notification_snd_title">Сигнал сообщений</string>
 <string name="notification_snd_sum"></string>
 

--- a/res/values/strings.xml	Mon May 10 20:13:12 2010 +0200
+++ b/res/values/strings.xml	Sat May 15 14:36:13 2010 +0200
@@ -119,8 +119,8 @@
 	<string name="away_message_sum">The away message that will be displayed</string>
 	<string name="away_message_hint">I\'m away, my cellphone screen is off</string>
 	<string name="notification_preferences">Notification settings</string>
-	<string name="notification_disable_vibrate_title">Vibrate</string>
-	<string name="notification_disable_vibrate_sum">Disable vibrate on incoming messages</string>
+	<string name="notification_enable_vibrate_title">Enable vibrate</string>
+	<string name="notification_enable_vibrate_sum">Enable vibrate on incoming messages</string>
 	<string name="notification_snd_title">Message ringtone</string>
 	<string name="notification_snd_sum">Set your incoming message ringtone</string>
 

--- a/src/com/beem/project/beem/BeemApplication.java	Mon May 10 20:13:12 2010 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java	Sat May 15 14:36:13 2010 +0200
@@ -79,6 +79,11 @@
     public static final String PROXY_USERNAME_KEY = "proxy_username";
     /** Preference key for the proxy password */
     public static final String PROXY_PASSWORD_KEY = "proxy_password";
+    /** Preference key for vibrate on notification */
+    public static final String NOTIFICATION_VIBRATE_KEY = "notification_vibrate";
+    /** Preference key for notification sound */
+    public static final String NOTIFICATION_SOUND_KEY = "notification_sound";
+
     //TODO add the other one
 
     private boolean mIsConnected;

--- a/src/com/beem/project/beem/BeemService.java	Mon May 10 20:13:12 2010 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Sat May 15 14:36:13 2010 +0200
@@ -64,6 +64,7 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.net.ConnectivityManager;
+import android.net.Uri;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
@@ -163,7 +164,6 @@
     public boolean onUnbind(Intent intent) {
 	Log.d(TAG, "ONUNBIND()");
 	if (!mConnection.getAdaptee().isConnected()) {
-	    Log.d(TAG, "DESTROYED");
 	    this.stopSelf();
 	}
 	return true;
@@ -220,7 +220,6 @@
     @Override
     public void onDestroy() {
 	super.onDestroy();
-	Log.d("Service", "onDestroy");
 	resetStatus();
 	mNotificationManager.cancelAll();
 	unregisterReceiver(mReceiver);
@@ -247,11 +246,16 @@
     }
 
     /**
-     * Show a notification.
+     * Show a notification using the preference of the user.
      * @param id the id of the notification.
      * @param notif the notification to show
      */
     public void sendNotification(int id, Notification notif) {
+	if (mSettings.getBoolean(BeemApplication.NOTIFICATION_VIBRATE_KEY, true))
+	    notif.defaults |= Notification.DEFAULT_VIBRATE;
+	notif.defaults |= Notification.DEFAULT_LIGHTS;
+	String ringtoneStr = mSettings.getString(BeemApplication.NOTIFICATION_SOUND_KEY, "");
+	notif.sound = Uri.parse(ringtoneStr);
 	mNotificationManager.notify(id, notif);
     }
 

--- a/src/com/beem/project/beem/service/BeemChatManager.java	Mon May 10 20:13:12 2010 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java	Sat May 15 14:36:13 2010 +0200
@@ -75,8 +75,8 @@
  * @author darisk
  */
 public class BeemChatManager extends IChatManager.Stub {
-    /** Tag to use with log methods. */
-    public static final String TAG = "BeemChatManager";
+
+    private static final String TAG = "BeemChatManager";
     private final ChatManager mAdaptee;
     private final Map<String, ChatAdapter> mChats = new HashMap<String, ChatAdapter>();
     private final ChatListener mChatListener = new ChatListener();
@@ -95,9 +95,6 @@
 	mAdaptee.addChatListener(mChatListener);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void addChatCreationListener(IChatManagerListener listener) throws RemoteException {
 	if (listener != null)
@@ -258,7 +255,7 @@
 	 */
 	private PendingIntent makeChatIntent(IChat chat) {