diff --git a/converse.js b/converse.js
index 7522f5ecf..4ed4427ef 100644
--- a/converse.js
+++ b/converse.js
@@ -1567,6 +1567,7 @@
allow_otr: converse.allow_otr && !this.is_chatroom,
label_clear: __('Clear all messages'),
label_end_encrypted_conversation: __('End encrypted conversation'),
+ label_insert_smiley: __('Insert a smiley'),
label_hide_participants: __('Hide the list of participants'),
label_refresh_encrypted_conversation: __('Refresh encrypted conversation'),
label_start_call: __('Start a call'),
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 66b5d3114..023169ded 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -8,6 +8,7 @@ Changelog
* Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
* Bugfix. clearSessions during unload event would throw an error when not logged in. [gbonvehi]
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
+* Add placeholder for "Insert a smiley" translation [thierrytiti]
0.9.3 (2015-05-01)
------------------
diff --git a/src/templates/toolbar.html b/src/templates/toolbar.html
index c1d21ef2c..2b5dd2fa0 100644
--- a/src/templates/toolbar.html
+++ b/src/templates/toolbar.html
@@ -1,5 +1,5 @@
{[ if (show_emoticons) { ]}
-
+