diff --git a/README.md b/README.md
index 77ae2cf9..d53a9225 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,10 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [3]:**
+**Bugfixes and features included in the next upcoming release [4]:**
 
 * Avoid race-conditions of async WSARecv() operations with write watches.
+* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
 * Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
 * Take abs() of vertex z coordinate as FFP fog coordinate
 
diff --git a/debian/changelog b/debian/changelog
index 857beca2..06ae1504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ wine-compholio (1.7.32) UNRELEASED; urgency=low
   * Added patch to avoid failure because of missing ptrace support for Exagear.
   * Added patch to automatically detect if tests are running under Wine.
   * Added patch to avoid sending unexpected wakeup with uninitialized cookie value.
+  * Added patch to fix issues with dragging layers between images in Adobe Photoshop 7.0.
   * Removed patch to close server fd is there is no space in thread inflight fd list (accepted upstream).
   * Removed patch to fix bugs in StrStr functions (accepted upstream).
   * Removed patches to avoid sending messages in FindWindowExW (accepted upstream).
diff --git a/patches/Makefile b/patches/Makefile
index 683d36b9..b5fb4b66 100644
--- a/patches/Makefile
+++ b/patches/Makefile
@@ -101,6 +101,7 @@ PATCHLIST := \
 	user32-DrawTextExW.ok \
 	user32-GetSystemMetrics.ok \
 	user32-GetTipText.ok \
+	user32-Mouse_Message_Hwnd.ok \
 	user32-WndProc.ok \
 	wine.inf-ProductId.ok \
 	wineboot-HKEY_DYN_DATA.ok \
@@ -1541,6 +1542,21 @@ user32-GetTipText.ok:
 		echo '+    { "Erich E. Hoover", "Fix TOOLTIPS_GetTipText when a NULL instance is used.", 1 },'; \
 	) > user32-GetTipText.ok
 
+# Patchset user32-Mouse_Message_Hwnd
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#12007] Fix issues with dragging layers between images in Adobe Photoshop 7.0
+# |
+# | Modified files:
+# |   *	dlls/user32/message.c, dlls/user32/tests/input.c
+# |
+.INTERMEDIATE: user32-Mouse_Message_Hwnd.ok
+user32-Mouse_Message_Hwnd.ok:
+	$(call APPLY_FILE,user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch)
+	@( \
+		echo '+    { "Dmitry Timoshkov", "user32: Try harder to find a target for mouse messages.", 1 },'; \
+	) > user32-Mouse_Message_Hwnd.ok
+
 # Patchset user32-WndProc
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch b/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
new file mode 100644
index 00000000..c1253233
--- /dev/null
+++ b/patches/user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
@@ -0,0 +1,41 @@
+From c13437712f404badbdbdc2352f0ffe0df8ad8265 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@codeweavers.com>
+Date: Tue, 25 Nov 2014 20:31:58 +0100
+Subject: user32: Try harder to find a target for mouse messages
+
+---
+ dlls/user32/message.c     | 2 +-
+ dlls/user32/tests/input.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/user32/message.c b/dlls/user32/message.c
+index eac4e4d..da29dc6 100644
+--- a/dlls/user32/message.c
++++ b/dlls/user32/message.c
+@@ -2501,7 +2501,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
+     }
+     else
+     {
+-        msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest );
++        msg->hwnd = WINPOS_WindowFromPoint( 0, msg->pt, &hittest );
+     }
+ 
+     if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd ))
+diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
+index 9b898d3..99ef777 100644
+--- a/dlls/user32/tests/input.c
++++ b/dlls/user32/tests/input.c
+@@ -1833,8 +1833,8 @@ static void test_Input_mouse(void)
+         }
+     }
+     ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n");
+-    todo_wine ok(got_button_down, "expected WM_LBUTTONDOWN message\n");
+-    todo_wine ok(got_button_up, "expected WM_LBUTTONUP message\n");
++    ok(got_button_down, "expected WM_LBUTTONDOWN message\n");
++    ok(got_button_up, "expected WM_LBUTTONUP message\n");
+     DestroyWindow(static_win);
+ 
+     /* click on HTTRANSPARENT top-level window that belongs to other thread */
+-- 
+2.1.3
+
diff --git a/patches/user32-Mouse_Message_Hwnd/definition b/patches/user32-Mouse_Message_Hwnd/definition
new file mode 100644
index 00000000..32763648
--- /dev/null
+++ b/patches/user32-Mouse_Message_Hwnd/definition
@@ -0,0 +1 @@
+Fixes: [12007] Fix issues with dragging layers between images in Adobe Photoshop 7.0