diff --git a/Xresources b/Xresources
index 3605628..58a0f1f 100644
--- a/Xresources
+++ b/Xresources
@@ -10,7 +10,7 @@ XTerm*faceName:           DejaVu_Sans_Mono_for_Powerline.otf:normal:pixelsize=12
 XTerm*dynamicColors:      true
 XTerm*utf8:               2
 XTerm*eightBitInput:      true
-XTerm*saveLines:          5120
+XTerm*saveLines:          10000
 XTerm*scrollTtyKeypress:  true
 XTerm*scrollTtyOutput:    false
 XTerm*scrollBar:          true
diff --git a/Xsession b/Xsession
index f6d3e4a..81981c0 100755
--- a/Xsession
+++ b/Xsession
@@ -13,10 +13,10 @@ esac
 eval $( /usr/bin/dbus-launch --sh-syntax --exit-with-session )
 
 # Starts gnome-keyring-daemon and exports its variables
-eval $( /usr/bin/gnome-keyring-daemon --start )
+eval $( /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export GNOME_KEYRING_CONTROL
 export SSH_AUTH_SOCK
-export GPG_AGENT_INFO
+#export GPG_AGENT_INFO
 
 # Starts pulseaudio
 /usr/bin/start-pulseaudio-x11
diff --git a/rc/im.lua b/rc/im.lua
index d99cca1..b9e4e2d 100644
--- a/rc/im.lua
+++ b/rc/im.lua
@@ -47,7 +47,7 @@ function mcabber_event_hook(kind, arg, jid, msg)
             preset = naughty.config.presets.normal
             icon = "person"
 
-            if string.match(jid, "nagios@dailymotion.com") then
+            if string.match(jid, "nagios@dailymotion.com") or string.match(jid, "Mon") then
                 if string.match(txt, "^PROBLEM:?") then
                     icon = "problem"
                     txt = string.gsub(txt, "^PROBLEM:? ", "")
@@ -58,7 +58,8 @@ function mcabber_event_hook(kind, arg, jid, msg)
                     icon = "notification"
                     txt = string.gsub(txt, "^ACKNOWLEDGEMENT: ", "")
                 end
-            elseif string.match(jid, "conference.dailymotion.com") then
+            elseif arg == "MUC" then
+                string.gsub(txt, "^<([^>])>", "<strong>%1</strong>")
                 icon = "chat"
             end