diff --git a/Linphone/core/notifier/Notifier.cpp b/Linphone/core/notifier/Notifier.cpp
index 39abec3c3..73ee52865 100644
--- a/Linphone/core/notifier/Notifier.cpp
+++ b/Linphone/core/notifier/Notifier.cpp
@@ -173,7 +173,7 @@ bool Notifier::createNotification(Notifier::NotificationType type, QVariantMap d
 						    // to have the Window on Top and fullscreen independant
 						    window->setFlags((showAsTool ? Qt::Tool : Qt::WindowStaysOnTopHint) |
 						                     Qt::FramelessWindowHint);
-#ifdef Q_OS_LINUX || Q_OS_WIN
+#if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
 						    window->setFlag(Qt::WindowDoesNotAcceptFocus);
 #endif
 						    //						    for (auto it = data.begin(); it != data.end(); ++it)
diff --git a/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml b/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml
index 80f943864..383be2c1b 100644
--- a/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml
+++ b/Linphone/view/Control/Display/Chat/ChatMessagesListView.qml
@@ -76,11 +76,25 @@ ListView {
         }
     }
 
-    onAtYBeginningChanged: if (atYBeginning && count !== 0) {
-        eventLogProxy.displayMore()
+    onAtYBeginningChanged: {
+        if (atYBeginning && count !== 0) {
+            eventLogProxy.displayMore()
+        }
     }
-    onAtYEndChanged: if (atYEnd && chat && count !== 0) {
-        chat.core.lMarkAsRead()
+    onAtYEndChanged: {
+        if (atYEnd && chat && count !== 0) {
+            chat.core.lMarkAsRead()
+        }
+    }
+
+    Connections {
+        // enabled: chat !== null
+        target: mainItem.chat ? mainItem.chat.core : null
+        function onUnreadMessagesCountChanged() {
+            if (mainItem.atYEnd){
+                mainItem.chat.core.lMarkAsRead()
+            }
+        }
     }
 
     model: EventLogProxy {
diff --git a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
index 1a70fac12..6daac5346 100644
--- a/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/AbstractSettingsLayout.qml
@@ -100,7 +100,7 @@ Rectangle {
 			}
 		}
 	}
-	Flickable {
+	Control.ScrollView {
 		id: scrollView
 		anchors.left: parent.left
 		anchors.right: parent.right
@@ -108,6 +108,8 @@ Rectangle {
 		anchors.top: header.bottom
         anchors.topMargin: Utils.getSizeWithScreenRatio(16)
 		contentHeight: contentListView.contentHeight
+		// Workaround for the ScrollView to cover the whole page
+		Item{anchors.fill: parent}
 		Control.ScrollBar.vertical: ScrollBar {
 			active: contentListView.contentHeight > scrollView.height
 			visible: contentListView.contentHeight > scrollView.height
diff --git a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
index 4d0ffcf1d..990f122fd 100644
--- a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
+++ b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
@@ -153,6 +153,7 @@ AbstractSettingsLayout {
 		id: audioCodecsComponent
 		ColumnLayout {
 			ListView {
+				id: audioCodecsList
 				Layout.preferredHeight: contentHeight
 				Layout.fillWidth: true
                 spacing: Utils.getSizeWithScreenRatio(20)
@@ -160,7 +161,7 @@ AbstractSettingsLayout {
 					filterType: PayloadTypeProxy.Audio | PayloadTypeProxy.NotDownloadable
 				}
 				delegate: SwitchSetting {
-					width: parent.width
+					width: audioCodecsList.width
                     height: Utils.getSizeWithScreenRatio(32)
 					titleText: Utils.capitalizeFirstLetter(modelData.core.mimeType)
 					subTitleText: modelData.core.clockRate + " Hz"