diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index fe07dbd..1db43d7 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -26,9 +26,10 @@
         <%= watchers_checkboxes(@issue, @available_watchers) %>
       </span>
       <span class="search_for_watchers">
-      <%= link_to_remote l(:label_search_for_watchers),
-                   :url => {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
-                   :method => 'get' %>
+      <%= link_to l(:label_search_for_watchers),
+                  {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+                  :remote => true,
+                  :method => 'get' %>
       </span>
       </p>
     <% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5601e0e..fa81e46 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -70,10 +70,11 @@ end %>
 <hr />
 <% if @issue.description? %>
   <div class="contextual">
-  <%= link_to_remote_if_authorized(
-        l(:button_quote),
-        { :url => {:controller => 'journals', :action => 'new', :id => @issue} },
-        :class => 'icon icon-comment') %>
+  <%= link_to l(:button_quote),
+              {:controller => 'journals', :action => 'new', :id => @issue},
+              :remote => true,
+              :method => 'post',
+              :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
   </div>
 
   <p><strong><%=l(:field_description)%></strong></p>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 831d3ec..36737b1 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -3,11 +3,13 @@
 
 <div class="contextual">
     <%= watcher_tag(@topic, User.current) %>
-    <%= link_to_remote_if_authorized(
+    <%= link_to(
           l(:button_quote),
-          { :url => {:action => 'quote', :id => @topic} },
-          :class => 'icon icon-comment'
-        ) unless @topic.locked? %>
+          {:action => 'quote', :id => @topic},
+          :remote => true,
+          :method => 'get',
+          :class => 'icon icon-comment',
+          :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
     <%= link_to(
           l(:button_edit),
           {:action => 'edit', :id => @topic},
@@ -38,11 +40,12 @@
 <% @replies.each do |message| %>
   <div class="message reply" id="<%= "message-#{message.id}" %>">
     <div class="contextual">
-      <%= link_to_remote_if_authorized(
+      <%= link_to(
             image_tag('comment.png'),
-            { :url => {:action => 'quote', :id => message} },
-            :title => l(:button_quote)
-          ) unless @topic.locked? %>
+            {:action => 'quote', :id => message},
+            :remote => true,
+            :method => 'get',
+            :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %>
       <%= link_to(
             image_tag('edit.png'),
             {:action => 'edit', :id => message},