diff --git a/Changelog.md b/Changelog.md
index baaa09914..7609db882 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,7 +16,7 @@
 * Improve time agos by updating the plugin [#4280](https://github.com/diaspora/diaspora/issues/4280)
 * Use youtube HTTPS scheme for oEmbed [#4743](https://github.com/diaspora/diaspora/pull/4743)
 * Fix infinite scroll on aspect streams [#4729](https://github.com/diaspora/diaspora/issues/4729)
-
+* Do not add a space after adding a mention [#4767](https://github.com/diaspora/diaspora/issues/4767)
 
 ## Features
 * You can report a single post by clicking the correct icon in the controler section [#4517](https://github.com/diaspora/diaspora/pull/4517)
diff --git a/vendor/assets/javascripts/jquery.mentionsInput.js b/lib/assets/javascripts/jquery.mentionsInput.js
similarity index 99%
rename from vendor/assets/javascripts/jquery.mentionsInput.js
rename to lib/assets/javascripts/jquery.mentionsInput.js
index 40efd9db0..6fcfa40be 100644
--- a/vendor/assets/javascripts/jquery.mentionsInput.js
+++ b/lib/assets/javascripts/jquery.mentionsInput.js
@@ -170,7 +170,7 @@
       hideAutoComplete();
 
       // Mentions & syntax message
-      var updatedMessageText = start + mention.value + ' ' + end;
+      var updatedMessageText = start + mention.value + end;
       elmInputBox.val(updatedMessageText);
       updateValues();