diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index ffd112f405d36fd2ed54830fcb1b85b114bf8b9e..298b2be05feeac77bb3e312fd7052d7162570415 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1833,6 +1833,9 @@ ConnectionJingle, ConnectionIBBytestream):
         if not self.connection or self.connected < 2:
             return
         iq_obj = obj.stanza.buildReply('result')
+        q = iq_obj.getTag('ping')
+        if q:
+            iq_obj.delChild(q)
         self.connection.send(iq_obj)
 
     def _PrivacySetCB(self, con, iq_obj):
diff --git a/src/roster_window.py b/src/roster_window.py
index d901ce0f83d4dc7c95767688c6d620f883bef145..f4769082f6276ff51bfbfac2febde624f5161993 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3457,6 +3457,8 @@ class RosterWindow:
         """
         When a key is pressed in the treeviews
         """
+        print 'tree', event.keyval
+        print gtk.gdk.keyval_to_unicode(event.keyval)
         self.tooltip.hide_tooltip()
         if event.keyval == gtk.keysyms.Escape:
             if self.rfilter_enabled:
@@ -4435,6 +4437,7 @@ class RosterWindow:
         self.disable_rfilter()
 
     def on_rfilter_entry_key_press_event(self, widget, event):
+        print 'rfilter', event.keyval
         if event.keyval == gtk.keysyms.Escape:
             self.disable_rfilter()
         elif event.keyval == gtk.keysyms.Return: