diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index bcf2a519b..3af68d5d3 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -83,7 +83,7 @@ class MemosController < ApplicationController
   end
 
   def edit
-    @replying = true
+    @replying = false
   end
 
   def update
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 42440c0c7..ac0165f79 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1332,7 +1332,6 @@ module ApplicationHelper
   # Add by Tao
   def url_to_avatar(source)
     source = nil if source.kind_of?(String)
-    logger.error "======================================#{source.class}"
     get_avatar(source)
   end
   # Endof Tao's code
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index a483cb724..ed60b1530 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,6 +1,11 @@
 <div class="content-title-top">
+	<div style="text-align:right;">
 	<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
+
+		<%= link_to l(:label_query), '#', :class => 'icon icon-help',
+	            :onclick => '$("#custom_query").toggle(); ' if User.current.logged? %>
+	</div>
 </div>
 </h3>
 <div class="contextual">
@@ -14,45 +19,46 @@
 
 <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
 <%= hidden_field_tag 'set_filter', '1' %>
-<div id="query_form_content" class="hide-when-print">
-	<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
-		<legend onclick="toggleFieldset(this);">
-			<%= l(:label_issue_query_condition) %>
-		</legend>
-		<div style="<%= @query.new_record? ? "" : "display: none;" %>">
-			<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-		</div>
-	</fieldset>
-	<fieldset class="collapsible collapsed"  style="width:650px;">
-		<legend onclick="toggleFieldset(this);">
-			<%= l(:label_options) %>
-		</legend>
-		<div style="display: none;">
-			<table>
-				<tr>
-					<td><%= l(:field_column_names) %></td>
-					<td><%= render_query_columns_selection(@query) %></td>
-				</tr>
-				<tr>
-					<td><label for='group_by'><%= l(:field_group_by) %></label></td>
-					<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by) ) %></td>
-				</tr>
-				<tr>
-					<td><%= l(:button_show) %></td>
-					<td><%= available_block_columns_tags(@query) %></td>
-				</tr>
-			</table>
-		</div>
-	</fieldset>
-</div>
-<div class="buttons hide-when-print">
-	<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-	<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
+<div id="custom_query", style='display: none;'>
+	<div id="query_form_content" class="hide-when-print">
+		<fieldset id="filters" style="width:650px;" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+			<legend onclick="toggleFieldset(this);">
+				<%= l(:label_issue_query_condition) %>
+			</legend>
+			<div style="<%= @query.new_record? ? "" : "display: none;" %>">
+				<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+			</div>
+		</fieldset>
+		<fieldset class="collapsible collapsed"  style="width:650px;">
+			<legend onclick="toggleFieldset(this);">
+				<%= l(:label_options) %>
+			</legend>
+			<div style="display: none;">
+				<table>
+					<tr>
+						<td><%= l(:field_column_names) %></td>
+						<td><%= render_query_columns_selection(@query) %></td>
+					</tr>
+					<tr>
+						<td><label for='group_by'><%= l(:field_group_by) %></label></td>
+						<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by) ) %></td>
+					</tr>
+					<tr>
+						<td><%= l(:button_show) %></td>
+						<td><%= available_block_columns_tags(@query) %></td>
+					</tr>
+				</table>
+			</div>
+		</fieldset>
+	</div>
+	<div class="buttons hide-when-print">
+		<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+		<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
+	</div>
 </div>
 <% end %>
 
 <%= error_messages_for 'query' %>
-
 <% if @query.valid? %>
 	<% if @issues.empty? %>
 		<p class="nodata">
@@ -60,7 +66,7 @@
 		</p>
 	<% else %>
 		<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-		<div class="pagination"><%= pagination_links_full @issue_pages, @issue_count %> </div>
+		<div class="pagination"><ul><%= pagination_links_full @issue_pages, @issue_count %></ul></div>
 	<% end %>
 	<div style="float: right; padding-top: 30px">
 		<% other_formats_links do |f| %>
@@ -97,14 +103,14 @@
 
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom,
-{:query_id => @query, :format => 'atom',
-:page => nil, :key => User.current.rss_key},
-:title => l(:label_issue_plural)) %>
+														{:query_id => @query, :format => 'atom',
+														:page => nil, :key => User.current.rss_key},
+														:title => l(:label_issue_plural)) %>
 <%= auto_discovery_link_tag(:atom,
-{:controller => 'journals', :action => 'index',
-:query_id => @query, :format => 'atom',
-:page => nil, :key => User.current.rss_key},
-:title => l(:label_changes_details)) %>
+														{:controller => 'journals', :action => 'index',
+														:query_id => @query, :format => 'atom',
+														:page => nil, :key => User.current.rss_key},
+														:title => l(:label_changes_details)) %>
 <% end %>
 
 <%= context_menu issues_context_menu_path %>