diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 59f557074..b1904f9ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -207,14 +207,8 @@
 			<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
 		</receiver>
 		
-		<receiver android:name="KeepAliveReceiver">
-		    <intent-filter>
-		        <action android:name="android.intent.action.SCREEN_ON"></action>
-		    </intent-filter>
-		    <intent-filter>
-		        <action android:name="android.intent.action.SCREEN_OFF"></action>
-		    </intent-filter>
-        </receiver>
+		<!-- This one needs to be registered from application -->
+		<receiver android:name="KeepAliveReceiver"/>
         
 		<!-- Needed for push notification -->
 		<receiver android:name="org.linphone.gcm.GCMReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 739387310..3454c21d8 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -80,8 +80,11 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.hardware.Sensor;
@@ -140,6 +143,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	private boolean mAudioFocused;
 	private int mLastNetworkType=-1;
 	private ConnectivityManager mConnectivityManager;
+	private BroadcastReceiver mKeepAliveReceiver;
+	private IntentFilter mKeepAliveIntentFilter;
 	private Handler mHandler = new Handler();
 	private WakeLock mIncallWakeLock;
 	private static List<LinphoneChatMessage> mPendingChatFileMessage;
@@ -633,6 +638,11 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Log.e(e);
 		}
 		finally {
+			try {
+				mServiceContext.unregisterReceiver(mKeepAliveReceiver);
+			} catch (Exception e) {
+				Log.e(e);
+			}
 			mLc = null;
 		}
 	}
@@ -640,7 +650,12 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	public void restartLinphoneCore() {
 		destroyLinphoneCore();
 		startLibLinphone(mServiceContext);
-        
+		/* 
+		 You cannot receive this through components declared in manifests, only 
+		 by explicitly registering for it with Context.registerReceiver(). This is a protected intent that can only 
+		 be sent by the system.
+		*/ 
+		mServiceContext.registerReceiver(mKeepAliveReceiver, mKeepAliveIntentFilter);
 		sExited = false;
 	}
 
@@ -730,6 +745,16 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Compatibility.initPushNotificationService(mServiceContext);
 		}
 
+		/* 
+		 You cannot receive this through components declared in manifests, only 
+		 by explicitly registering for it with Context.registerReceiver(). This is a protected intent that can only 
+		 be sent by the system.
+		*/ 
+		mKeepAliveIntentFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
+		mKeepAliveIntentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+		mKeepAliveReceiver = new KeepAliveReceiver();
+		mServiceContext.registerReceiver(mKeepAliveReceiver, mKeepAliveIntentFilter);
+
 		updateNetworkReachability();
 
 		if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
@@ -845,6 +870,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			Log.e(e);
 		}
 		finally {
+			mServiceContext.unregisterReceiver(mKeepAliveReceiver);
 			mLc = null;
 			instance = null;
 		}
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 5e7743a27..813df0236 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -20,7 +20,6 @@ package org.linphone;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Calendar;
 
 import org.linphone.compatibility.Compatibility;
 import org.linphone.core.LinphoneAddress;