diff --git a/postal.lua b/mail.lua
similarity index 99%
rename from postal.lua
rename to mail.lua
index 78d7ae3..a88c190 100644
--- a/postal.lua
+++ b/mail.lua
@@ -56,7 +56,7 @@ end
 
 function MAIL_SEND_SUCCESS()
 	if SendMail_state then
-		addAutoCompleteName(SendMail_state.subject)
+		addAutoCompleteName(gsub(strlower(SendMail_state.to), '^%l', strupper))
 	end
 	SendMail_sending = false
 end
diff --git a/postal.toc b/mail.toc
similarity index 100%
rename from postal.toc
rename to mail.toc
diff --git a/postal.xml b/mail.xml
similarity index 100%
rename from postal.xml
rename to mail.xml