diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 7fdf5d02c..1e31881d5 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -68,7 +68,7 @@
       <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @message.org_subfield_editable_by?(User.current) %>
+      <% if User.current.logged? %>
           <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 16a2a55d6..a14138903 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -43,6 +43,31 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <% if User.current.logged? %>
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'message')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:controller => 'messages', :action => 'edit', :id => activity, :board_id => activity.board_id},
+                                :class => 'postOptionLink'
+                        ) if activity.org_subfield_editable_by?(User.current) %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                {:controller => 'messages', :action => 'destroy', :id => activity, :board_id => activity.board_id},
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if activity.org_subfield_editable_by?(User.current) %>
+                  </li>
+                </ul>
+            <% end %>
+          </li>
+        </ul>
+      </div>
     </div>
     <div class="cl"></div>
   </div>