3 files changed, 27 insertions, 8 deletions
diff --git a/qmsgwatchlet/metawatch-digital.qml b/qmsgwatchlet/metawatch-digital.qml
index 43c6e1f..e5e999f 100644
--- a/qmsgwatchlet/metawatch-digital.qml
+++ b/qmsgwatchlet/metawatch-digital.qml
@@ -18,6 +18,7 @@ MWPage {
 		anchors.left: parent.left
 		anchors.right: parent.right
 		anchors.bottom: parent.bottom
+		clip: true
 		model: MessageModel {
 			sortBy: MessageModel.Timestamp
 			sortOrder: MessageModel.DescendingOrder
@@ -36,22 +37,33 @@ MWPage {
 			limit: 20
 		}
 		delegate: Rectangle {
+			id: msgDelegate
 			property bool selected: ListView.isCurrentItem
-			width: list.width
+			width: parent.width
 			height: childrenRect.height
 			color: ListView.isCurrentItem ? "black" : "white"
-			Text {
-				width: 96
-				text: "<b>" + sender + "</b><br>" + subject
-				wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-				color: parent.selected ? "white" : "black"
+			Column {
+				width: parent.width
+				MWLabel {
+					width: parent.width
+					text: sender
+					wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+					color: msgDelegate.selected ? "white" : "black"
+					font.pointSize: 12
+				}
+				MWLabel {
+					width: parent.width
+					text: subject
+					wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+					color: msgDelegate.selected ? "white" : "black"
+				}
 			}
 		}
 	}
 
 	Connections {
 		target: watch
-		onButtonPressed : {
+		onButtonPressed: {
 			switch (button) {
 			case 1:
 				list.scrollUp();
@@ -61,5 +73,10 @@ MWPage {
 				break;
 			}
 		}
+		onActiveChanged: {
+			if (watch.active) {
+				list.scrollTop();
+			}
+		}
 	}
 }
diff --git a/qmsgwatchlet/qmsgwatchlet.cpp b/qmsgwatchlet/qmsgwatchlet.cpp
index 35a99d8..7111c81 100644
--- a/qmsgwatchlet/qmsgwatchlet.cpp
+++ b/qmsgwatchlet/qmsgwatchlet.cpp
@@ -1,3 +1,5 @@
+#include <QtCore/QDebug>
+
 #include "qmsgwatchlet.h"
 
 QTM_USE_NAMESPACE
diff --git a/qmsgwatchlet/qmsgwatchlet.h b/qmsgwatchlet/qmsgwatchlet.h
index c2de7ec..6fa331c 100644
--- a/qmsgwatchlet/qmsgwatchlet.h
+++ b/qmsgwatchlet/qmsgwatchlet.h
@@ -14,7 +14,7 @@ public:
 	explicit QMsgWatchlet(WatchServer* server);
 
 private:
-	QTM_PREPEND_NAMESPACE(QMessageService) _qms;
+	QtMobility::QMessageService *_qms;
 };
 
 }