--- a/src/mouse.c	2012-07-30 09:51:42.000000000 +0400
+++ b/src/mouse.c	2012-08-10 15:56:04.868170012 +0400
@@ -2044,7 +2044,7 @@
 {
     MouseDevPtr pMse = pInfo->private;
 
-    if (!pMse->emulate3ButtonsSoft)
+    if (pMse->emulate3Buttons || !pMse->emulate3ButtonsSoft)
         return TRUE;
 
     xf86Msg(X_INFO,"3rd Button detected: disabling emulate3Button\n");