--- a/src/gui/painting/qwindowsurface_s60.cpp	Fri Sep 17 08:34:18 2010 +0300
+++ b/src/gui/painting/qwindowsurface_s60.cpp	Mon Oct 04 01:19:32 2010 +0300
@@ -67,15 +67,13 @@
 
     TDisplayMode mode = S60->screenDevice()->DisplayMode();
     bool isOpaque = qt_widget_private(widget)->isOpaque;
-    if (mode == EColor16MA && isOpaque) {
-        mode = EColor16MU; // Faster since 16MU -> 16MA is typically accelerated
-    } else if (mode == EColor16MU && !isOpaque) {
+    if (isOpaque) {
+        mode = EColor16MU;
+    } else  {
         if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3)
-            mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 has hw support for ARGB32_PRE
+            mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 WServ has support for ARGB32_PRE
         else
             mode = EColor16MA; // Symbian prior to Symbian^3 sw accelerates EColor16MA
-    } else if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3 && !isOpaque) {
-        mode = Q_SYMBIAN_ECOLOR16MAP; // Symbian^3 has hw support for ARGB32_PRE
     }
 
     // We create empty CFbsBitmap here -> it will be resized in setGeometry