diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 0c39ee5c6..f61ed35f6 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -373,6 +373,7 @@ class BidsController < ApplicationController
   #by xianbo
   def homework_destroy
     @bid_to_destroy = Bid.find params[:course_id]
+    (render_403; return false) unless User.current.admin?||User.current.id==bid.author_id
     @bid_to_destroy.destroy
     respond_to do |format|
       format.html { redirect_to :back }
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 840a661cc..78a4d6f40 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -7,22 +7,34 @@
 		<td>
 		<table width="100%" border="0">
 			<tr>
-				<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
+				<td colspan="2" valign="top"><strong><span><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></span>
+					
+					<span style="float: right"><%= link_to(
+					l(:button_delete),
+					{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
+					:method => :post,
+					:data => {:confirm => l(:text_are_you_sure)},
+					:class => 'icon icon-del'
+					) if (User.current.admin?||User.current.id==bid.author_id)&&(bid.homework_type == 1)%></span></td>
+				</strong></td>
 			</tr>
 			<tr>
 				<td width="500">
 				<table border="0">
 					<tr>
 						<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %>
-							<%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> 
+							<%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> 
+							<% else %> 
 							
 							<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
 					</tr>
 					<tr>
 						<td><span class="font_lighter">
 							<% if bid.homework_type == 1%>
+							
 							<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
-							<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %>
+							<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>
+							</strong>)<% end %>
 							
 						</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
 					</tr>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 0529de844..3787efe4a 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -20,7 +20,7 @@
           :method => :post,
           :data => {:confirm => l(:text_are_you_sure)},
           :class => 'icon icon-del'
-         ) if @message.destroyable_by?(User.current) %>
+         ) if @bid.destroyable_by?(User.current) %>
 </div>
 
 <h3><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h3>
diff --git a/app/views/users/_my_create_homework.html.erb b/app/views/users/_my_create_homework.html.erb
index 845fb093e..6f17ab265 100644
--- a/app/views/users/_my_create_homework.html.erb
+++ b/app/views/users/_my_create_homework.html.erb
@@ -13,13 +13,14 @@
 			<tr>
 				<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: &nbsp;
 				<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>&nbsp;&nbsp;&nbsp;
-				<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong> <%= link_to(
-				l(:button_delete),
-				{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
-				:method => :post,
-				:data => {:confirm => l(:text_are_you_sure)},
-				:class => 'icon icon-del'
-				)  %></span></td>
+				<%= l(:label_course_homework) %> : <%= link_to(bid.courses.first.name, project_path(bid.courses.first)) %></strong> </span>
+					<span style="float: right"><%= link_to(
+					l(:button_delete),
+					{:action => 'homework_destroy', :controller=>'bids', :course_id => bid.id},
+					:method => :post,
+					:data => {:confirm => l(:text_are_you_sure)},
+					:class => 'icon icon-del'
+					) if User.current.admin?||User.current.id==bid.author_id%></span></td>
 		</td>
 	</tr>
 	<tr>