Index: branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php	(revision 21185)
+++ branches/version-2_11-dev/data/class/helper/SC_Helper_Mail.php	(revision 21302)
@@ -150,5 +150,5 @@
         $arrTplVar->tpl_user_point = $objCustomer->getValue('point');
 
-       if(Net_UserAgent_Mobile::isMobile() === true) {
+       if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
             $objMailView = new SC_MobileView_Ex();
        } else {
Index: branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php	(revision 21259)
+++ branches/version-2_11-dev/data/class/helper/SC_Helper_Purchase.php	(revision 21302)
@@ -431,6 +431,7 @@
             }
 
-            if (Net_UserAgent_Mobile::isMobile()
-                && in_array('email', $keys)) {
+            if ((SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE)
+                && in_array('email', $keys)
+            ) {
                 $email_mobile = $objCustomer->getValue('email_mobile');
                 if (empty($email_mobile)) {
@@ -1060,6 +1061,7 @@
     function sendOrderMail($orderId) {
         $mailHelper = new SC_Helper_Mail_Ex();
-        $mailHelper->sfSendOrderMail($orderId,
-                                     SC_MobileUserAgent_Ex::isMobile() ? 2 : 1);
+        $template_id =
+            SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
+        $mailHelper->sfSendOrderMail($orderId, $template_id);
     }