diff --git a/apps/mobile_frontend/modules/default/actions/urlProxyAction.class.php b/apps/mobile_frontend/modules/default/actions/urlProxyAction.class.php
index d7dce9e..e671875 100644
--- a/apps/mobile_frontend/modules/default/actions/urlProxyAction.class.php
+++ b/apps/mobile_frontend/modules/default/actions/urlProxyAction.class.php
@@ -31,6 +31,7 @@ class urlProxyAction extends sfAction
     }
 
     $this->url = $zendUri->getUri();
+    $this->encordedUrl = urlencode($this->url);
     $this->proxys = sfConfig::get('op_mobile_proxys');
   }
 }
diff --git a/apps/mobile_frontend/modules/default/templates/urlProxySuccess.php b/apps/mobile_frontend/modules/default/templates/urlProxySuccess.php
index 2657e78..e5d36f2 100644
--- a/apps/mobile_frontend/modules/default/templates/urlProxySuccess.php
+++ b/apps/mobile_frontend/modules/default/templates/urlProxySuccess.php
@@ -11,16 +11,16 @@ URL <input type="text" value="<?php echo $url ?>">
 <?php echo __('Use Proxy Site for Mobile') ?>
 <?php foreach ($proxys as $name => $purl): ?>
 <br>
-<a href="<?php echo strpos($purl, '%s') ? sprintf($purl, urlencode($url)) : $purl.urlencode($url) ?>"<?php echo $i <= 9 ? 'accesskey="'.$i.'"' : '' ?>><?php echo ($i <= 9 ? $i++.'. ' : '').$name ?></a>
+<a href="<?php echo strpos($purl, '%s') ? sprintf($purl, $encordedUrl) : $purl.$encordedUrl ?>"<?php echo $i <= 9 ? 'accesskey="'.$i.'"' : '' ?>><?php echo ($i <= 9 ? $i++.'. ' : '').$name ?></a>
 <?php endforeach; ?>
 <hr>
 <?php endif; ?>
 <a href="<?php echo $url ?>" accesskey="0"><?php echo '0. '.__('Direct link') ?></a><br>
-<a href="mailto:?body=<?php echo urlencode($url) ?>" accesskey="*"><?php echo '*. '.__('Send this URL by E-mail') ?></a>
+<a href="mailto:?body=<?php echo $encordedUrl ?>" accesskey="*"><?php echo '*. '.__('Send this URL by E-mail') ?></a>
 <?php if ($sf_request->getMobile()->isDoCoMo()): ?>
 <br><a href="<?php echo $url ?>" accesskey="#" ifb>#. ﾌﾙﾌﾞﾗｳｻﾞ</a>
 <?php elseif ($sf_request->getMobile()->isEZweb()): ?>
-<br><a href="device:pcsiteviewer?url=<?php echo urlencode($url) ?>" accesskey="#" >#. PCｻｲﾄﾋﾞｭｰﾜ</a>
+<br><a href="device:pcsiteviewer?url=<?php echo $encordedUrl ?>" accesskey="#" >#. PCｻｲﾄﾋﾞｭｰﾜ</a>
 <?php endif; ?>
 
 <?php slot('op_mobile_footer', ''); ?>
diff --git a/lib/helper/opUtilHelper.php b/lib/helper/opUtilHelper.php
index 022ffa2..c1e52ea 100644
--- a/lib/helper/opUtilHelper.php
+++ b/lib/helper/opUtilHelper.php
@@ -541,12 +541,13 @@ function _op_auto_links_outer_urls($text, $href_options = array(), $truncate = f
     }
     ';
 
+  use_helper('Escaping');
   if ($truncate)
   {
     $callback_function .= '
       else if (strlen($matches[2].$matches[3]) > '.$truncate_len.')
       {
-        return $matches[1].\'<a href="'.$proxyAction.'?url=\'.urlencode(($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3]).\'"'.$href_options.'>\'.substr($matches[2].$matches[3], 0, '.$truncate_len.').\''.$pad.'</a>\'.$matches[4];
+        return $matches[1].\'<a href="'.$proxyAction.'?url=\'.esc_specialchars(urlencode(htmlspecialchars_decode(($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3], ENT_QUOTES))).\'"'.$href_options.'>\'.substr($matches[2].$matches[3], 0, '.$truncate_len.').\''.$pad.'</a>\'.$matches[4];
       }
       ';
   }
@@ -554,7 +555,7 @@ function _op_auto_links_outer_urls($text, $href_options = array(), $truncate = f
   $callback_function .= '
     else
     {
-      return $matches[1].\'<a href="'.$proxyAction.'?url=\'.urlencode(($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3]).\'"'.$href_options.'>\'.$matches[2].$matches[3].\'</a>\'.$matches[4];
+      return $matches[1].\'<a href="'.$proxyAction.'?url=\'.esc_specialchars(urlencode(htmlspecialchars_decode(($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3], ENT_QUOTES))).\'"'.$href_options.'>\'.$matches[2].$matches[3].\'</a>\'.$matches[4];
     }
     ';