diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp
index b5ac30fa5..bf9d1cef1 100644
--- a/src/ui/manager.cpp
+++ b/src/ui/manager.cpp
@@ -272,8 +272,6 @@ static MouseButtons mouse_buttons_from_she_to_ui(const she::Event& sheEvent)
 
 void Manager::generateMessagesFromSheEvents()
 {
-  she::Event lastMouseMoveEvent;
-
   // Events from "she" layer.
   she::Event sheEvent;
   for (;;) {
@@ -336,12 +334,10 @@ void Manager::generateMessagesFromSheEvents()
       }
 
       case she::Event::MouseMove: {
-        // TODO Currently we cannot handleMouseMove() for each
-        // she::Event::MouseMove as the UI library is not prepared yet
-        // to process more than one kMouseMoveMessage message for
-        // loop-cycle. The main problem are the functions to control
-        // scroll (Window::moveWindow() and Widget::scrollRegion()).
-        lastMouseMoveEvent = sheEvent;
+        _internal_set_mouse_position(sheEvent.position());
+
+        handleMouseMove(sheEvent.position(), m_mouseButtons,
+                        sheEvent.modifiers());
         break;
       }
 
@@ -381,13 +377,6 @@ void Manager::generateMessagesFromSheEvents()
       }
     }
   }
-
-  if (lastMouseMoveEvent.type() != she::Event::None) {
-    _internal_set_mouse_position(lastMouseMoveEvent.position());
-
-    handleMouseMove(lastMouseMoveEvent.position(), m_mouseButtons,
-                    lastMouseMoveEvent.modifiers());
-  }
 }
 
 void Manager::handleMouseMove(const gfx::Point& mousePos,