diff --git a/addons/mobile/classes/mhtml.class.php b/addons/mobile/classes/mhtml.class.php
index f26ab2ce9..b90dbc1c3 100644
--- a/addons/mobile/classes/mhtml.class.php
+++ b/addons/mobile/classes/mhtml.class.php
@@ -64,7 +64,7 @@
                 printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");
             }
             // 언어선택
-            $url = getUrl('','lcm','1','sel_lang',Context::getLangType());
+            $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
             printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
         }
 
diff --git a/addons/mobile/classes/mobile.class.php b/addons/mobile/classes/mobile.class.php
index 98d3f626a..33816b151 100644
--- a/addons/mobile/classes/mobile.class.php
+++ b/addons/mobile/classes/mobile.class.php
@@ -117,10 +117,12 @@
          * 쿠키가 안되기 때문에 휴대전화마다 고유한 파일로 언어설정을 저장하는 파일 생성
          **/
         function setLangType() {
-            $langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-            if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-            $langbuff = '<?php /**'.$this->lang.'**/ ?>';
-            FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
+            if($this->lang) {
+                $langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+                if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+                $langbuff = '<?php /**'.$this->lang.'**/ ?>';
+                FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
+            }
         }
 
         /**
@@ -180,8 +182,10 @@
             $userAgent = $_SERVER['HTTP_USER_AGENT'];
             $wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
 
-            if(eregi("SKT11", $userAgent)) return "wml";
-            elseif(eregi("skt", $browserAccept)) return "wml";
+            if(eregi("SKT11", $userAgent) || eregi("skt", $browserAccept)) {
+                Context::set('mobile_skt',1);
+                return "wml";
+            }
             elseif(eregi("hdml", $browserAccept)) return "hdml";
             elseif(eregi("CellPhone", $userAgent)) return  "mhtml";
             return null;
@@ -194,11 +198,7 @@
             if(!$charset) $charset = 'UTF-8';
 
             //SKT는 euc-kr만 지원
-            $userAgent = $_SERVER['HTTP_USER_AGENT'];
-            $browserAccept = $_SERVER['HTTP_ACCEPT'];
-            $wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
-            if(eregi("SKT11", $userAgent)) $charset = 'euc-kr';
-            elseif(eregi("skt", $browserAccept)) $charset = 'euc-kr';
+            if(Context::get('mobile_skt')==1) $charset = 'euc-kr';
 
             $this->charset = $charset;
         }
@@ -539,6 +539,12 @@
                     $childs[] = $obj;
                 }
             }
+
+            $obj = null;
+            $obj['link'] = $obj['text'] = Context::getLang('lang_return');
+            $obj['href'] = Context::get('return_uri');
+            $childs[] = $obj;
+
             $this->setChilds($childs);
 
             $this->display();
diff --git a/addons/mobile/classes/wml.class.php b/addons/mobile/classes/wml.class.php
index fae282aa7..28913ba55 100644
--- a/addons/mobile/classes/wml.class.php
+++ b/addons/mobile/classes/wml.class.php
@@ -68,7 +68,7 @@
                 $url = $this->upperUrl;
                 printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
             }
-            $url = getUrl('','lcm','1','sel_lang',Context::getLangType());
+            $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
             printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
         }
 
@@ -79,7 +79,12 @@
 
         // 목록등에서 일련 번호를 리턴한다
         function getNo() {
-            return "vnd.skmn".parent::getNo();
+            if(Context::get('mobile_skt')==1) {
+                return "vnd.skmn".parent::getNo();
+            }
+            else {
+                return parent::getNo();
+            }
             return $str;
         }
     }