diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index f3074dc8d..9ce272cb8 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -678,10 +678,10 @@
             $content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content);
 
             // <br> 코드 변환
-            $content = str_replace(array("<BR>","<br>","<Br>"),"<br />", $content);
+            $content = preg_replace('/<br([^>]*)>/i','<br$1/>', $content);
 
             // <img ...> 코드를 <img ... /> 코드로 변환
-            $content = preg_replace('!<img(.*?)(\/){0,1}>!is','<img\\1 />', $content);
+            $content = preg_replace('/<img([^>^\/]*)(\/>|>)/i','<img$1 />', $content);
 
             return $content;
         }
diff --git a/modules/editor/components/quotation/quotation.class.php b/modules/editor/components/quotation/quotation.class.php
index 5767eabb2..b536153f9 100644
--- a/modules/editor/components/quotation/quotation.class.php
+++ b/modules/editor/components/quotation/quotation.class.php
@@ -92,10 +92,13 @@
                 }
 
                 $style .= "display:none;";
-                $output .= sprintf('<div id="folder_open_%s" style="margin:%spx;display:block;"><a class="%s" href="#" onclick="zbxe_folder_open(\'%s\');return false;">%s</a></div>', $folder_id, $margin, $class, $folder_id, $folder_opener);
-                $output .= sprintf('<div id="folder_close_%s" style="margin:%spx;display:none;"><a class="%s" href="#" onclick="zbxe_folder_close(\'%s\');return false;">%s</a></div>', $folder_id, $margin, $class, $folder_id, $folder_closer);
+
+                $folder_margin = sprintf("%spx %spx %spx %spx", $margin, $margin, 10, $margin);
+                $output .= sprintf('<div id="folder_open_%s" style="margin:%s;display:block;"><a class="%s" href="#" onclick="zbxe_folder_open(\'%s\');return false;">%s</a></div>', $folder_id, $folder_margin, $class, $folder_id, $folder_opener);
+                $output .= sprintf('<div id="folder_close_%s" style="margin:%s;display:none;"><a class="%s" href="#" onclick="zbxe_folder_close(\'%s\');return false;">%s</a></div>', $folder_id, $folder_margin, $class, $folder_id, $folder_closer);
 
                 $output .= sprintf('<div style="%s" id="folder_%s">', $style, $folder_id);
+                debugPrint($output);
             } else {
                 $output .= sprintf('<div style="%s">', $style);
             }