diff --git a/gui_for_me/gui_for_me.py b/gui_for_me/gui_for_me.py
index 97744e096eba4283088f6c424719105f3adcf099..3ba9b1e8069b4c4bde4fae81174f59920b987d61 100644
--- a/gui_for_me/gui_for_me.py
+++ b/gui_for_me/gui_for_me.py
@@ -14,8 +14,10 @@ class GuiForMe(GajimPlugin):
         self.description = _('Gui for the \'/me\' command.')
         self.config_dialog = None  # GuiForMePluginConfigDialog(self)
         self.gui_extension_points = {
-                'chat_control_base': (self.connect_with_chat_control,
-                                       self.disconnect_from_chat_control)}
+            'chat_control_base': (self.connect_with_chat_control,
+                                  self.disconnect_from_chat_control),
+            'chat_control_base_update_toolbar': (self.update_button_state,
+                                                None)}
         self.controls = []
 
     @log_calls('GuiForMePlugin')
@@ -34,6 +36,13 @@ class GuiForMe(GajimPlugin):
             control.disconnect_from_chat_control()
         self.controls = []
 
+    @log_calls('GuiForMePlugin')
+    def update_button_state(self, chat_control):
+        for base in self.controls:
+            if base.chat_control != chat_control:
+                continue
+            base.button.set_sensitive(chat_control.msg_textview.get_sensitive())
+
 
 class Base(object):
     def __init__(self, plugin, chat_control):
diff --git a/gui_for_me/manifest.ini b/gui_for_me/manifest.ini
index 8591a2594cbb3d7612a7ddc44d8ccd6f94be6941..0b29a4cc7af8a789d9c9bfa4dd197ddccd7819f6 100644
--- a/gui_for_me/manifest.ini
+++ b/gui_for_me/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: GUI For Me
 short_name: gui_for_me
-version: 0.1
+version: 0.2
 description: Gui for the '/me' command.
 authors: BomberMan
  copper
diff --git a/quick_replies/manifest.ini b/quick_replies/manifest.ini
index c05b41c5ce9648a2bb644114e9ef042f226fbbec..6f1c8f9266e09d524e7f6198fd57d7794a90dbca 100644
--- a/quick_replies/manifest.ini
+++ b/quick_replies/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Quick replies
 short_name: quick_replies
-version: 0.0.1
+version: 0.0.2
 description: Plugin for quick insert template message and add your own template messages
 authors = Evgeniy Popov <evgeniypopov@gmail.com>
 homepage = http://trac-plugins.gajim.org/wiki/QuickRepliesPlugin
diff --git a/quick_replies/plugin.py b/quick_replies/plugin.py
index 185781c29d736dd12231b7515ff5d433e105e256..f0650bb951da86233226ecaf5ad4df21786c830f 100644
--- a/quick_replies/plugin.py
+++ b/quick_replies/plugin.py
@@ -16,7 +16,9 @@ class QuickRepliesPlugin(GajimPlugin):
         self.chat_control = None
         self.gui_extension_points = {
             'chat_control_base': (self.connect_with_chat_control,
-                                    self.disconnect_from_chat_control), }
+                                    self.disconnect_from_chat_control),
+            'chat_control_base_update_toolbar': (self.update_button_state,
+                                    None)}
         self.config_default_values = {
             'entry1': ('Hello!', ''),
             'entry2': ('How are you?', ''),
@@ -45,6 +47,13 @@ class QuickRepliesPlugin(GajimPlugin):
             control.disconnect_from_chat_control()
         self.controls = []
 
+    @log_calls('GuiForMePlugin')
+    def update_button_state(self, chat_control):
+        for base in self.controls:
+            if base.chat_control != chat_control:
+                continue
+            base.button.set_sensitive(chat_control.msg_textview.get_sensitive())
+
 
 class Base(object):