diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index f61b0cf9b..cc34c3654 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -287,14 +287,25 @@
             $logged_info = Context::get('logged_info');
 
             // 변수 정리
+            $args->friend_group_srl = trim(Context::get('friend_group_srl'));
             $args->member_srl = $logged_info->member_srl;
             $args->title = Context::get('title');
             if(!$args->title) return new Object(-1, 'msg_invalid_request');
 
-            $output = executeQuery('member.addFriendGroup', $args);
+            // friend_group_srl이 있으면 수정
+            if($args->friend_group_srl) {
+                $output = executeQuery('member.renameFriendGroup', $args);
+                $msg_code = 'success_updated';
+
+            // 아니면 입력
+            } else {
+                $output = executeQuery('member.addFriendGroup', $args);
+                $msg_code = 'success_registed';
+            }
+
             if(!$output->toBool()) return $output;
 
-            $this->setMessage('success_registed');
+            $this->setMessage($msg_code);
         }
 
         /**
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index f2023d57e..0ea48cb2b 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -594,6 +594,19 @@
             return $output->data->count;
         }
 
+        /**
+         * @brief 특정 친구 그룹 가져오기 
+         **/
+        function getFriendGroupInfo($friend_group_srl) {
+            $logged_info = Context::get('logged_info');
+
+            $args->member_srl = $logged_info->member_srl;
+            $args->friend_group_srl = $friend_group_srl;
+
+            $output = executeQuery('member.getFriendGroup', $args);
+            return $output->data;
+        }
+
         /**
          * @brief 그룹 목록 가져오기
          **/
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index be9a4db65..ffae535ba 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -341,6 +341,15 @@
             if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
             $logged_info = Context::get('logged_info');
 
+            // 그룹 번호가 넘어오면 수정모드로..
+            $friend_group_srl = Context::get('friend_group_srl');
+            if($friend_group_srl) {
+                $oMemberModel = &getModel('member');
+                $friend_group = $oMemberModel->getFriendGroupInfo($friend_group_srl);
+                if($friend_group->friend_group_srl == $friend_group_srl) Context::set('friend_group', $friend_group);
+            }
+
+
             $this->setTemplateFile('add_friend_group');
         }
 
diff --git a/modules/member/queries/getFriendGroup.xml b/modules/member/queries/getFriendGroup.xml
new file mode 100644
index 000000000..a0db0468f
--- /dev/null
+++ b/modules/member/queries/getFriendGroup.xml
@@ -0,0 +1,12 @@
+<query id="getFriendGroup" action="select">
+    <tables>
+        <table name="member_friend_group" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" />
+        <condition operation="equal" column="friend_group_srl" var="friend_group_srl" />
+    </conditions>
+</query>
diff --git a/modules/member/skins/default/add_friend_group.html b/modules/member/skins/default/add_friend_group.html
index 9b9e6db71..1efb2be68 100644
--- a/modules/member/skins/default/add_friend_group.html
+++ b/modules/member/skins/default/add_friend_group.html
@@ -3,14 +3,23 @@
 
 <div style="width:400px;">
     <form action="./" method="get" onsubmit="return procFilter(this, add_friend_group)">
+        <input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
         <div style="font-weight:bold">
-            {$lang->cmd_add_friend_group}
+            <!--@if($friend_group->friend_group_srl)-->
+                {$lang->cmd_rename_friend_group}
+            <!--@else-->
+                {$lang->cmd_add_friend_group}
+            <!--@end-->
         </div>
         <div>
-            {$lang->friend_group} : <input type="text" name="title" value="" />
+            {$lang->friend_group} : <input type="text" name="title" value="{htmlspecialchars($friend_group->title)}" />
         </div>
         <div>
-            <input type="submit" value="{$lang->cmd_insert}" />
+            <!--@if($friend_group->friend_group_srl)-->
+                <input type="submit" value="{$lang->cmd_modify}" />
+            <!--@else-->
+                <input type="submit" value="{$lang->cmd_insert}" />
+            <!--@end-->
             <input type="button" value="{$lang->cmd_close}" onclick="window.close();return false;"/>
         </div>
     </form>
diff --git a/modules/member/skins/default/friends_list.html b/modules/member/skins/default/friends_list.html
index aeffd921a..85c856984 100644
--- a/modules/member/skins/default/friends_list.html
+++ b/modules/member/skins/default/friends_list.html
@@ -2,7 +2,7 @@
 <!--%import("filter/delete_checked_friend.xml")-->
 <!--%import("filter/delete_friend_group.xml")-->
 
-<div style="width:500px;">
+<div style="width:700px;">
     <form action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
 
         <!-- 그룹 목록 -->
@@ -27,19 +27,22 @@
                 <!--@else-->
                 <div>
                 <!--@end-->
-                    <a href="{getUrl('friend_group_srl',$val->friend_group_srl)}">{$val->title}</a> [<a href="#" onclick="doDeleteFriendGroup('{$val->friend_group_srl}');return false;">{$lang->cmd_delete}</a>]
+                    <a href="{getUrl('friend_group_srl',$val->friend_group_srl)}">{$val->title}</a> 
+                    [<a href="#" onclick="doDeleteFriendGroup('{$val->friend_group_srl}');return false;">{$lang->cmd_delete}</a>]
+                    [<a href="#" onclick="doRenameFriendGroup('{$val->friend_group_srl}');return false;">{$lang->cmd_modify}</a>]
                 </div>
 
             <!--@end-->
         </div>
 
         <!-- 친구 목록 -->
-        <div style="float:left;width:350px;">
+        <div style="float:left;width:550px;">
             <table border="1" width="100%">
             <tr>
                 <th colspan="2">{$lang->user_id}</th>
                 <th>{$lang->user_name}</th>
                 <th>{$lang->nick_name}</th>
+                <th>{$lang->cmd_send_message}</th>
                 <th>{$lang->regdate}</th>
             </tr>
             <!--@foreach($friend_list as $no => $val)-->
@@ -47,7 +50,8 @@
                 <td><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /></td>
                 <td>{$val->user_id}</td>
                 <td>{$val->user_name}</td>
-                <td><div class="member_{$val->target_srl}">{$val->nick_name}</div></td>
+                <td>{$val->nick_name}</td>
+                <td><a href="#" onclick="popopen('./?module=member&amp;act=dispMemberSendMessage&amp;receiver_srl={$val->target_srl}','sendMessage');return false">{$lang->cmd_send_message}</a></td>
                 <td>{zdate($val->regdate,"Y-m-d")}</td>
             </tr>
             <!--@end-->
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js
index 7c048e171..502b6da53 100644
--- a/modules/member/skins/default/js/member.js
+++ b/modules/member/skins/default/js/member.js
@@ -144,3 +144,8 @@ function completeDeleteFriendGroup(ret_obj) {
     alert(ret_obj['message']);
     location.href = location.href.setQuery('friend_group_srl','');
 }
+
+/* 친구 그룹의 이름 변경 */
+function doRenameFriendGroup(friend_group_srl) {
+    popopen("./?module=member&act=dispMemberAddFriendGroup&friend_group_srl="+friend_group_srl);
+}