diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 79f844c..1c87a7a 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -1259,6 +1259,8 @@ public class ComposerWidget : Gtk.EventBox {
     }
     
     private void on_action(Gtk.Action action) {
+        debug("on_action");
+        
         if (action_flag)
             return;
         
@@ -1350,6 +1352,8 @@ public class ComposerWidget : Gtk.EventBox {
     }
     
     private void on_paste() {
+        debug("on_paste");
+        
         if (container.get_focus() == editor)
             get_clipboard(Gdk.SELECTION_CLIPBOARD).request_text(on_clipboard_text_received);
         else if (container.get_focus() is Gtk.Editable)
@@ -1357,6 +1361,8 @@ public class ComposerWidget : Gtk.EventBox {
     }
     
     private void on_paste_with_formatting() {
+        debug("on_paste_with_formatting");
+        
         if (container.get_focus() == editor)
             editor.paste_clipboard();
     }
@@ -1637,6 +1643,9 @@ public class ComposerWidget : Gtk.EventBox {
     // This overrides the keypress handling for the *widget*; the WebView editor's keypress overrides
     // are handled by on_editor_key_press
     public override bool key_press_event(Gdk.EventKey event) {
+        debug("key_press_event: is_modifier=%s keyval=%s", (event.is_modifier != 0).to_string(),
+            Gdk.keyval_name(event.keyval));
+        
         update_actions();
         
         switch (Gdk.keyval_name(event.keyval)) {
@@ -1651,6 +1660,17 @@ public class ComposerWidget : Gtk.EventBox {
                     return true;
                 }
             break;
+            
+// Uncomment to fix/hack around bug
+/*
+            case "v":
+                if ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
+                    on_paste();
+                    
+                    return true;
+                }
+            break;
+*/
         }
         
         return base.key_press_event(event);
@@ -1743,6 +1763,9 @@ public class ComposerWidget : Gtk.EventBox {
     }
     
     private bool on_editor_key_press(Gdk.EventKey event) {
+        debug("on_editor_key_press: is_modifier=%s keyval=%s", (event.is_modifier != 0).to_string(),
+            Gdk.keyval_name(event.keyval));
+        
         // widget's keypress override doesn't receive non-modifier keys when the editor processes
         // them, regardless if true or false is called; this deals with that issue (specifically
         // so Ctrl+Enter will send the message)
