diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index b535fae..e149cbb 100644
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -1,5 +1,6 @@
-<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? %>
+<%= link_to l(:button_add_notes), issue_path(@issue), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class =>'icon icon-comment' if User.current.allowed_to?(:add_issue_notes, @project) %>
+<%= link_to l(:button_edit), edit_issue_path(@issue), :onclick => 'showAndScrollTo("edit_issue", "issue_notes"); $("#cancel_edit_issue").show(); $("#edit_issue_header").show(); $("#add_notes_header").hide(); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project) %>
<%= link_to l(:button_log_time), new_issue_time_entry_path(@issue), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project) %>
<%= watcher_link(@issue, User.current) %>
<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index 67e3324..0ac1303 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -2,6 +2,7 @@
<%= error_messages_for 'issue', 'time_entry' %>
<%= render :partial => 'conflict' if @conflict %>
+
<% if @issue.attributes_editable? %>
+<%= render :partial => 'action_menu' %>
<% if @changesets.present? %>
@@ -125,14 +126,11 @@ end %>
<% end %>
-
-
-<%= render :partial => 'action_menu' %>
-
<% if @issue.editable? %>
-
-
<%= l(:button_edit) %>
+
+
+
<%= render :partial => 'edit' %>
<% end %>
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
index cd6ab0d..b7f11e5 100644
--- a/app/views/journals/new.js.erb
+++ b/app/views/journals/new.js.erb
@@ -6,5 +6,5 @@ $('#issue_notes').val("<%= raw escape_javascript(@content) %>");
$('#issue_private_notes').prop('checked', true);
<% end %>
-showAndScrollTo("update", "notes");
-$('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight;
+showAndScrollTo("update", "issue_notes");
+$('#issue_notes').scrollTop = $('#issue_notes').scrollHeight - $('#issue_notes').clientHeight;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a6501c3..afde6d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1013,6 +1013,7 @@ en:
button_edit: Edit
button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
button_add: Add
+ button_add_notes: Add notes
button_change: Change
button_apply: Apply
button_clear: Clear