diff --git a/applets/notifications/contents/ui/main.qml b/applets/notifications/contents/ui/main.qml
index a607ab64cb3e5385e61f04f3552a9ed7f3dc3d6a..0caf22e1d871a0ea96862b5bb47ca076b6d022b7 100644
--- a/applets/notifications/contents/ui/main.qml
+++ b/applets/notifications/contents/ui/main.qml
@@ -156,48 +156,6 @@ Item {
             summary: "July: Hello?"
             actions: []
         }
-        ListElement {
-            source: "im2Source"
-            appIcon: "im-google"
-            appName: "Message"
-            summary: "July: Hello?"
-            actions: []
-        }
-        ListElement {
-            source: "im2Source"
-            appIcon: "im-google"
-            appName: "Message"
-            summary: "July: Hello?"
-            actions: []
-        }
-        ListElement {
-            source: "im2Source"
-            appIcon: "im-google"
-            appName: "Message"
-            summary: "July: Hello?"
-            actions: []
-        }
-        ListElement {
-            source: "im2Source"
-            appIcon: "im-google"
-            appName: "Message"
-            summary: "July: Hello?"
-            actions: []
-        }
-        ListElement {
-            source: "im2Source"
-            appIcon: "im-google"
-            appName: "Message"
-            summary: "July: Hello?"
-            actions: []
-        }
-        ListElement {
-            source: "im2Source"
-            appIcon: "im-google"
-            appName: "Message"
-            summary: "July: Hello?"
-            actions: []
-        }
     }
 
     ListView {
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index ee7bca74d28a805ad1594da4d92b4c56bf10e64c..0f799985458f05e86eaf54384c334df79df8cc31 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -515,10 +515,7 @@ Item {
                 snapMode: GridView.SnapToRow
 
                 onFlickingChanged: {
-                    if (!draggingVertically && contentY < -headerItem.height + root.height) {
-                        scrollAnim.to = Math.round(contentY/root.height) * root.height
-                        scrollAnim.running = true;
-                    }
+                    draggingVerticallyChanged(false);
                 }
                 onDraggingVerticallyChanged: {
                     if (draggingVertically) {
@@ -540,13 +537,6 @@ Item {
                         scrollAnim.running = true;
                         return;
                     }
-
-                    //(1000/scrollAnim.duration) is the length scrolled at the current speed in the duration of the animation
-
-                    if (contentY < -headerItem.height + root.height) {
-                        scrollAnim.to = Math.round((contentY + (verticalVelocity / (1000/scrollAnim.duration))) / root.height) * root.height
-                        scrollAnim.running = true;
-                    }
                 }
                 NumberAnimation {
                     id: scrollAnim