--- a/app/src/main/java/com/beem/project/beem/BeemService.java	Tue Oct 27 01:12:06 2015 +0100
+++ b/app/src/main/java/com/beem/project/beem/BeemService.java	Fri Nov 13 17:50:23 2015 +0100
@@ -52,7 +52,6 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -66,6 +65,7 @@
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.support.v4.app.NotificationManagerCompat;
 import android.util.Log;
 
 import com.beem.project.beem.service.XmppConnectionAdapter;
@@ -122,7 +122,7 @@
     private static final String TAG = "BeemService";
     private static final int DEFAULT_XMPP_PORT = 5222;
 
-    private NotificationManager mNotificationManager;
+    private NotificationManagerCompat mNotificationManager;
     private XmppConnectionAdapter mConnection;
     private SharedPreferences mSettings;
     private String mLogin;
@@ -284,7 +284,7 @@
 
 	configure(ProviderManager.getInstance());
 
-	mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+	mNotificationManager = NotificationManagerCompat.from(this);
 
 	Roster.setDefaultSubscriptionMode(SubscriptionMode.manual);
 
@@ -393,7 +393,7 @@
      * Get the notification manager system service.
      * @return the notification manager service.
      */
-    public NotificationManager getNotificationManager() {
+    public NotificationManagerCompat getNotificationManager() {
 	return mNotificationManager;
     }