diff --git a/Changelog.md b/Changelog.md
index 52b4a7de9cc4de17fa8db4bede79ac2cc435f31d..5e6979712b78254dfeb2e93eeb809bdd86442807 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
 * Use typeahead.js from rails-assets.org [#7192](https://github.com/diaspora/diaspora/pull/7192)
 * Refactor ShareVisibilitesController to use PostService [#7196](https://github.com/diaspora/diaspora/pull/7196)
 * Unify desktop and mobile head elements [#7194](https://github.com/diaspora/diaspora/pull/7194)
+* Refactor flash messages on ajax errors for comments, likes, reshares and aspect memberships [#7202](https://github.com/diaspora/diaspora/pull/7202)
 
 ## Bug fixes
 * Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 848e842dbbc468e3fa8265f273835a55c7c8caf9..bde3e2fbbf76d36efb7d7fb40d4b3176cd0bb8e0 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -15,14 +15,14 @@ class CommentsController < ApplicationController
     begin
       comment = comment_service.create(params[:post_id], params[:text])
     rescue ActiveRecord::RecordNotFound
-      render text: I18n.t("javascripts.failed_to_comment"), status: 404
+      render text: I18n.t("comments.create.error"), status: 404
       return
     end
 
     if comment
       respond_create_success(comment)
     else
-      render text: I18n.t("javascripts.failed_to_comment"), status: 422
+      render text: I18n.t("comments.create.error"), status: 422
     end
   end
 
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index afc0be11364a36b158e53ff783e4174a88c3b309..5c2c65789d286654a81eb2256db491186e54f918 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -26,7 +26,7 @@ class LikesController < ApplicationController
         format.json { render :json => @like.as_api_response(:backbone), :status => 201 }
       end
     else
-      render text: I18n.t("javascripts.failed_to_like"), status: 422
+      render text: I18n.t("likes.create.error"), status: 422
     end
   end
 
diff --git a/app/controllers/reshares_controller.rb b/app/controllers/reshares_controller.rb
index 4c9f70ca2e969272a5670175a4b616729edca0d4..7345e6343ac3e5d01757fe86005807e39c1196eb 100644
--- a/app/controllers/reshares_controller.rb
+++ b/app/controllers/reshares_controller.rb
@@ -14,7 +14,7 @@ class ResharesController < ApplicationController
       current_user.dispatch_post(@reshare)
       render :json => ExtremePostPresenter.new(@reshare, current_user), :status => 201
     else
-      render text: I18n.t("javascripts.failed_to_reshare"), status: 422
+      render text: I18n.t("reshares.create.error"), status: 422
     end
   end
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index cdff0411ba9d5e9a656c58602c58ba038eb0c9a0..f6b53ca633212bd7e2edba438d0e82b01de565e4 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -240,6 +240,8 @@ en:
     explanation: "Post to diaspora* from anywhere by bookmarking this link => %{link}."
 
   comments:
+    create:
+      error: "Failed to comment."
     new_comment:
       comment: "Comment"
       commenting: "Commenting..."
@@ -591,6 +593,10 @@ en:
       source_package: "Download the source code package"
       be_excellent: "Be excellent to each other! ♥"
 
+  likes:
+    create:
+      error: "Failed to like."
+
   notifications:
     started_sharing:
       zero: "%{actors} started sharing with you."
@@ -991,6 +997,8 @@ en:
     invalid_invite: "The invite link you provided is no longer valid!"
 
   reshares:
+    create:
+      error: "Failed to reshare."
     reshare:
       reshared_via: "Reshared via"
       reshare_confirmation: "Reshare %{author}’s post?"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 94b9b49e0964a7f560623ffebdcf3c5c0e5ef185..a4583ee4f7b45e58c5d5caaff959bad759623475 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -189,9 +189,6 @@ en:
         one: "In <%= count %> aspect"
         other: "In <%= count %> aspects"
     show_more: "Show more"
-    failed_to_like: "Failed to like. Maybe the author is ignoring you?"
-    failed_to_reshare: "Failed to reshare!"
-    failed_to_comment: "Failed to comment. Maybe the author is ignoring you?"
     failed_to_post_message: "Failed to post message!"
     failed_to_remove: "Failed to remove the entry!"
     comments:
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index e951b87a691ed50d1e227f1c281f520d8acdeafb..704df125e74e098ede107cbab32245dd5f31e33c 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -67,7 +67,7 @@ describe CommentsController, :type => :controller do
       expect(alice).not_to receive(:comment)
       post :create, comment_hash
       expect(response.code).to eq("404")
-      expect(response.body).to eq(I18n.t("javascripts.failed_to_comment"))
+      expect(response.body).to eq(I18n.t("comments.create.error"))
     end
   end
 
diff --git a/spec/controllers/reshares_controller_spec.rb b/spec/controllers/reshares_controller_spec.rb
index 92d9072a810e8d66825822ec89df5648c7f0d2e4..c6f50f2d50e6f7bb5c4e4151d236fd4835746395 100644
--- a/spec/controllers/reshares_controller_spec.rb
+++ b/spec/controllers/reshares_controller_spec.rb
@@ -46,7 +46,7 @@ describe ResharesController, :type => :controller do
         it 'doesn\'t allow the user to reshare the post again' do
           post_request!
           expect(response.code).to eq('422')
-          expect(response.body).to eq(I18n.t("javascripts.failed_to_reshare"))
+          expect(response.body).to eq(I18n.t("reshares.create.error"))
         end
       end