diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 62f2df7ca..bcf73e998 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1362,10 +1362,10 @@
             $content = preg_replace_callback('!<style(.*?)<\/style>!is', array($this,'moveStyleToHeader'), $content);
 
             // <img|br> 코드 변환
-            $content = preg_replace('/<(img|br)([^>\/]*)(\/>|>)/i','<$1$2 />', $content);
+            $content = preg_replace('/<(img|br)([^>]*)(\/>|>)/i','<$1$2 />', $content);
 
             // templateHandler의 이미지 경로로 인하여 생기는 절대경로 이미지등의 경로 중복 처리
-            $content = preg_replace('/src=(["|\']?)http:\/\/([^ ]+)http:\/\//is','src=$1http://', $content);
+            $content = preg_replace('/<(img|input)([^>]*)src=(["|\']?)http:\/\/([^ ]+)http:\/\//is','<$1$2src=$3http://', $content);
 
             return $content;
         }
diff --git a/config/func.inc.php b/config/func.inc.php
index f82024cd1..cf2f4e1ba 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -562,7 +562,7 @@
         $tag = strtolower(trim($matches[1]));
 
         $buff = trim(preg_replace('/(\/>|>)/','/>',$matches[0]));
-        $buff = str_replace(array('&amp;','&'),array('&amp;','&amp;'),$buff);
+        $buff = str_replace(array('&','&amp;'),array('&amp;','&amp;'),$buff);
         $buff = preg_replace_callback('/([^=^"^ ]*)=([^ ^>]*)/i', fixQuotation, $buff);
 
         $oXmlParser = new XmlParser();
diff --git a/modules/tccommentnotify/conf/module.xml b/modules/tccommentnotify/conf/module.xml
index 70c967428..3399716a7 100644
--- a/modules/tccommentnotify/conf/module.xml
+++ b/modules/tccommentnotify/conf/module.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <module>
     <grants />
     <permissions />