diff --git a/modules/editor/components/image_link/lang/ko.lang.php b/modules/editor/components/image_link/lang/ko.lang.php
index 1b4c3fdb7..d79933a33 100644
--- a/modules/editor/components/image_link/lang/ko.lang.php
+++ b/modules/editor/components/image_link/lang/ko.lang.php
@@ -12,4 +12,5 @@
   $lang->image_align_left = "글의 왼쪽으로";
   $lang->image_align_middle = "가운데";
   $lang->image_align_right = "글의 우측으로";
+  $lang->image_border = "경계선 두께";
 ?>
diff --git a/modules/editor/components/image_link/tpl/popup.css b/modules/editor/components/image_link/tpl/popup.css
index d857a8bf1..e27adefd8 100644
--- a/modules/editor/components/image_link/tpl/popup.css
+++ b/modules/editor/components/image_link/tpl/popup.css
@@ -1,5 +1,5 @@
 .editor_window {
-  width:400px;
+  width:500px;
   text-align:center;
 }
 
@@ -15,7 +15,7 @@
 
 .body {
   float:left;
-  width:250px;
+  width:350px;
   text-align:left;
   margin:5px;
   font-size:9pt;
@@ -29,10 +29,17 @@
 
 .image_align {
   margin:0px 0px 5px 0px;
+  float:left;
+  width:150px;
 }
 
 .image_url {
-  width:240px;
+  width:350px;
+  border:1px solid #AAAAAA;
+}
+
+.editor_input {
+  width:40px;
   border:1px solid #AAAAAA;
 }
 
diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html
index bdc87171a..5a767cd04 100644
--- a/modules/editor/components/image_link/tpl/popup.html
+++ b/modules/editor/components/image_link/tpl/popup.html
@@ -41,6 +41,10 @@
         </label>
       </div>
     </div>
+
+    <div class="header">{$lang->image_border}</div>
+    <div class="body"><input type="text" class="editor_input" id="image_border" value="0" />px</div>
+
     <div class="editor_button_area">
       <input type="button" value="{$lang->cmd_insert}" class="editor_button" onclick="insertImage()" />
       <input type="button" value="{$lang->cmd_close}" class="editor_button" onclick="window.close();" />
diff --git a/modules/editor/components/image_link/tpl/popup.js b/modules/editor/components/image_link/tpl/popup.js
index a5131a045..868273d78 100644
--- a/modules/editor/components/image_link/tpl/popup.js
+++ b/modules/editor/components/image_link/tpl/popup.js
@@ -8,13 +8,14 @@ function insertImage(obj) {
     else if(xGetElementById("align_left").checked==true) align = "left";
     else if(xGetElementById("align_middle").checked==true) align = "middle";
     else if(xGetElementById("align_right").checked==true) align = "right";
+    var border = parseInt(xGetElementById("image_border").value,10);
 
     if(!url) {
       window.close();
       return;
     }
 
-    var text = "<img src=\""+url+"\" border=\"0\"";
+    var text = "<img src=\""+url+"\" border=\""+border+"\" plugin=\"image_link\" ";
     if(alt) text+= " alt=\""+alt+"\"";
     if(align) text+= " align=\""+align+"\" ";
     text+= " />";