diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 5305ae5a4c062971a3ad3843da430182db5871f0..d73f5d98bbf74ebde9b07b1484857132d23eb56a 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -283,6 +283,7 @@ public class NotificationService {
 		final String ringtone = preferences.getString("notification_ringtone", null);
 		final boolean vibrate = preferences.getBoolean("vibrate_on_notification", true);
 		final boolean led = preferences.getBoolean("led", true);
+		final boolean headsup = preferences.getBoolean("notification_headsup", mXmppConnectionService.getResources().getBoolean(R.bool.headsup_notifications));
 		if (notify && !isQuietHours()) {
 			if (vibrate) {
 				final int dat = 70;
@@ -303,7 +304,7 @@ public class NotificationService {
 		if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
 		}
-		mBuilder.setPriority(notify ? NotificationCompat.PRIORITY_DEFAULT : NotificationCompat.PRIORITY_LOW);
+		mBuilder.setPriority(notify ? (headsup ? NotificationCompat.PRIORITY_HIGH : NotificationCompat.PRIORITY_DEFAULT) : NotificationCompat.PRIORITY_LOW);
 		setNotificationColor(mBuilder);
 		mBuilder.setDefaults(0);
 		if (led) {
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 66dfdf3479285c7fc6679f3922a533d0992c33ff..66601cfee2a9c4cecea4acfe347c922d7641711b 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -4,4 +4,5 @@
     <bool name="portrait_only">true</bool>
     <bool name="enter_is_send">false</bool>
     <bool name="notifications_from_strangers">false</bool>
-</resources>
\ No newline at end of file
+    <bool name="headsup_notifications">false</bool>
+</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ccd556b2c2aedc533d02c53a787baddbd4d0cd46..f27ad0d3defc362a6bd3f7b47745e36967027327 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -752,4 +752,6 @@
 	<string name="account_status_regis_web">Server requires registration on website</string>
 	<string name="open_website">Open website</string>
 	<string name="application_found_to_open_website">No application found to open website</string>
+	<string name="pref_headsup_notifications">Heads-up Notifications</string>
+	<string name="pref_headsup_notifications_summary">Show Heads-up Notifications</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 684b981369f26089ba5082975e0ed52c2403c5be..6c6d592f8b73d7f099af55393614024d65356ceb 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -66,6 +66,12 @@
             android:ringtoneType="notification"
             android:summary="@string/pref_sound_summary"
             android:title="@string/pref_sound"/>
+        <CheckBoxPreference
+            android:defaultValue="@bool/headsup_notifications"
+            android:dependency="show_notification"
+            android:key="notification_headsup"
+            android:title="@string/pref_headsup_notifications"
+            android:summary="@string/pref_headsup_notifications_summary"/>
         <PreferenceScreen
             android:dependency="show_notification"
             android:key="quiet_hours"