diff --git a/src/QmlControls/QGCViewMessage.qml b/src/QmlControls/QGCViewMessage.qml
index 9d58df0bb8b3057e3c5941275c313fa55ea5678c..02f994b09498a5911bfca66b8523e4f2d4b94b13 100644
--- a/src/QmlControls/QGCViewMessage.qml
+++ b/src/QmlControls/QGCViewMessage.qml
@@ -20,9 +20,16 @@ import QGroundControl.Palette 1.0
 QGCViewDialog {
     property string message
 
-    QGCLabel {
+    QGCFlickable {
         anchors.fill:   parent
-        wrapMode:       Text.WordWrap
-        text:           message
+        contentHeight:  label.contentHeight
+
+        QGCLabel {
+            id:             label
+            anchors.left:   parent.left
+            anchors.right:  parent.right
+            wrapMode:       Text.WordWrap
+            text:           message
+        }
     }
 }