diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 192192922..56b11f9cf 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -251,6 +251,7 @@ public class Essentials extends JavaPlugin
 				m = m.replace("{PLAYER}", user.getDisplayName());
 				m = m.replace("{IP}", user.getAddress().toString());
 				m = m.replace("{BALANCE}", Double.toString(user.getMoney()));
+				m = m.replace("{MAILS}", Integer.toString(user.getMails().size()));
 			}
 
 			m = m.replace("{ONLINE}", Integer.toString(getServer().getOnlinePlayers().length));
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 8fd1d020e..1fdeeb3cd 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -89,6 +89,7 @@ motd:
   - '&fType &c/help&f for a list of commands.'
   - 'Currently online: {PLAYERLIST}'
   - 'Did you know that you can make [Disposal] signs with Essentials?'
+  - 'You have {MAILS} mail messages'
 
 # The server rules, available by typing /rules
 rules: