Index: sources/gui/qml/dialogs/AlarmListDialog.qml
===================================================================
diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r20b286ab574a6b8ad25a51aeb3477506f7dafc5d
--- sources/gui/qml/dialogs/AlarmListDialog.qml	(.../AlarmListDialog.qml)	(revision 376859852f4d1a07263c44524aec347db29e0133)
+++ sources/gui/qml/dialogs/AlarmListDialog.qml	(.../AlarmListDialog.qml)	(revision 20b286ab574a6b8ad25a51aeb3477506f7dafc5d)
@@ -97,25 +97,6 @@
         }
     }
 
-    TouchGrid { id: _alarmsGrid
-        visible         : vAlarmActiveList.adjustment_Accepted
-        anchors.top             : _titleBar.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        itemsValueLeftMargin    : 70
-        height          : Variables.dialogHeight - _titleBar.height //+ Variables.minVGap2
-        width           : parent.width
-        colCount        : 1
-        rowCount        : 10
-        itemWidth       : Variables.dialogWidth - Variables.minVGap2*2
-        itemHeight      : 58
-        rowSpacing      : 0
-        lineColor       : Colors.backgroundMain
-        itemsText       : vAlarmActiveList.alarmIDs     // [ 100, 200, 300, 400, 500, 600, 700, 800, 9999 ]
-        itemsValue      : vAlarmActiveList.alarmTexts   // [ "Alarm\nAtal Matal Tootoole 1", "Alarm\nGave hasan checjoore 2", "Alarm\nNa Shir Dare Na Pestoon 3", "Alarm\nGavesho bordan hendestoon 4", "Alarm 5", "Alarm 6", "Alarm 7", "Alarm 8", "Alarm 9" ]// vAlarmActiveList
-        itemsTouchable  : [ 1,1,1,1,1,1,1,1,1,1 ]
-        onItemClicked   : _root.itemClicked(vIndex)
-    }
-
     Text { id: _desc
         visible : ! vAlarmActiveList.adjustment_Accepted
         text    :   vAlarmActiveList.status
@@ -127,4 +108,46 @@
             verticalCenter: parent.verticalCenter;
         }
     }
+
+    ScrollBar {
+        visible     : vAlarmActiveList.adjustment_Accepted
+        anchors.fill: _flickable
+        flickable   : _flickable
+        backColor   : Colors.backgroundDialog
+    }
+
+    Flickable { id: _flickable
+        clip        : true
+        visible     : vAlarmActiveList.adjustment_Accepted
+        anchors {
+            top             : _titleBar.bottom
+            topMargin       : Variables.minVGap
+            bottom          : _root.bottom
+            bottomMargin    : Variables.mainMenuHeight + Variables.minVGap
+            horizontalCenter: parent.horizontalCenter
+        }
+        width        : Variables.dialogWidth - Variables.minVGap2 * 2 // * 2 : for each side
+        height       : Variables.dialogHeight - _titleBar.height - Variables.minVGap * 2 // * 2 : for each side
+        contentWidth : width
+        contentHeight: _alarmGrid.height
+
+        TouchGrid { id: _alarmGrid
+            alignCenter     : false
+            height          : rowCount * ( rowSpacing + itemHeight  )
+            width           : parent.width
+            colCount        : 1
+            rowCount        : 10
+            itemHeight      : 80
+            itemWidth       : Variables.dialogWidth - Variables.minVGap2 * (2 + 1) // * 2 : for each side & + 1 to not cover the scrollbar
+            rowSpacing      : 0
+            columnSpacing   : 0
+            lineColor       : Colors.backgroundMain
+            itemsText       : vAlarmActiveList.alarmIDs
+            itemsValue      : vAlarmActiveList.alarmTexts
+            itemsTouchable  : [ 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,  ] // just kept one touchable as an example
+            itemsValueLeftMargin    : 100 // if decreased maybe covered by title
+            itemsUnitLeftMargin     : 470 // if increased will be covered by chevron if touchable
+            onItemClicked: _root.itemClicked(vIndex)
+        }
+    }
 }