diff --git a/ChangeLog b/ChangeLog
index e282bb2b2c..9aa87e8ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,13 @@
 	GDK_CLIENT_EVENT unless there is a filter that matches and returns
 	something other than GDK_FILTER_CONTINUE. (#135552)
 
+	Merge from HEAD:
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_MOUSEMOVE, don't check if this process owns the active
+	window. This makes cross-application widget embedding work better.
+	On WM_MOVE, don't bother checking for window visibility.
+
 2005-03-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_set_visible_func): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e282bb2b2c..9aa87e8ead 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -13,6 +13,13 @@
 	GDK_CLIENT_EVENT unless there is a filter that matches and returns
 	something other than GDK_FILTER_CONTINUE. (#135552)
 
+	Merge from HEAD:
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_MOUSEMOVE, don't check if this process owns the active
+	window. This makes cross-application widget embedding work better.
+	On WM_MOVE, don't bother checking for window visibility.
+
 2005-03-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_set_visible_func): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e282bb2b2c..9aa87e8ead 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -13,6 +13,13 @@
 	GDK_CLIENT_EVENT unless there is a filter that matches and returns
 	something other than GDK_FILTER_CONTINUE. (#135552)
 
+	Merge from HEAD:
+
+	* gdk/win32/gdkevents-win32.c (gdk_event_translate): On
+	WM_MOUSEMOVE, don't check if this process owns the active
+	window. This makes cross-application widget embedding work better.
+	On WM_MOVE, don't bother checking for window visibility.
+
 2005-03-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_set_visible_func): 
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 0ee16379d5..ec87962754 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2160,8 +2160,6 @@ gdk_event_translate (GdkDisplay *display,
 		     MSG        *msg,
 		     gint       *ret_valp)
 {
-  DWORD pidActWin;
-  DWORD pidThis;
   RECT rect, *drag, orig_drag;
   POINT point;
   MINMAXINFO *mmi;
@@ -2726,12 +2724,6 @@ gdk_event_translate (GdkDisplay *display,
 			 msg->wParam,
 			 GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
-      /* HB: only process mouse move messages if we own the active window. */
-      GetWindowThreadProcessId (GetActiveWindow (), &pidActWin);
-      GetWindowThreadProcessId (msg->hwnd, &pidThis);
-      if (pidActWin != pidThis)
-	break;
-
       assign_object (&window, find_window_for_mouse_event (window, msg));
 
       if (p_grab_window != NULL)
@@ -3316,8 +3308,7 @@ gdk_event_translate (GdkDisplay *display,
 				 GET_X_LPARAM (msg->lParam), GET_Y_LPARAM (msg->lParam)));
 
       if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
-	  !IsIconic (msg->hwnd) &&
-	  IsWindowVisible (msg->hwnd))
+	  !IsIconic (msg->hwnd))
 	{
 	  if (!GDK_WINDOW_DESTROYED (window))
 	    handle_configure_event (msg, window);