diff --git a/autostart.lua b/autostart.lua
index afa0d06..c70efa9 100644
--- a/autostart.lua
+++ b/autostart.lua
@@ -5,7 +5,8 @@ os.execute ("pgrep pidgin || pidgin &")
 os.execute ("pgrep stardict || stardict &")
 os.execute ("pgrep urxvt || urxvt &")
 os.execute ("pgrep firefox || (firefox || firefox-bin) &")
-os.execute ("pgrep thunderbird || thunderbird &")
+os.execute ("pgrep geary || geary &")
 os.execute ("smbnetfs "..os.getenv("HOME").."/smb")
 os.execute (os.getenv("HOME").."/.config/awesome/set_wall.sh "..os.getenv("HOME").."/.config/awesome/wallpaper.slink")
 os.execute ("pgrep lightsOn.sh || "..os.getenv("HOME").."/.config/awesome/lightsOn.sh &")
+os.execute ("pgrep nm-applet || nm-applet &")
diff --git a/rc.lua b/rc.lua
index 2fb0661..3096992 100644
--- a/rc.lua
+++ b/rc.lua
@@ -99,7 +99,7 @@ naughty.config.defaults.hover_timeout = nil
 ----< Tags >----------------------------------------------------------
 --
 tags = {
-   names  = { "term",      "web",      "vm",       "office",   "note",
+   names  = { "term",      "web",      "vm",       "office",   "mail",
               "game",      "gimp",     "dict",     "im" },
    layout = { layouts[3],  layouts[1], layouts[1], layouts[1], layouts[1],
               layouts[1],  layouts[1], layouts[1], layouts[2]}
@@ -529,6 +529,8 @@ awful.rules.rules = {
       callback = function(c) awful.client.movetotag(tags[mouse.screen][2], c) end },
     { rule = { class = "Thunderbird" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][2], c) end },
+    { rule = { class = "Geary" },
+      callback = function(c) awful.client.movetotag(tags[mouse.screen][5], c) end },
     { rule = { class = "Liferea" },
       callback = function(c) awful.client.movetotag(tags[mouse.screen][2], c) end },
     { rule = { class = "VirtualBox" },