diff --git a/messages/src/main/java/de/srsoftware/umbrella/message/Constants.java b/messages/src/main/java/de/srsoftware/umbrella/message/Constants.java
index d0018b58..3f3e91bb 100644
--- a/messages/src/main/java/de/srsoftware/umbrella/message/Constants.java
+++ b/messages/src/main/java/de/srsoftware/umbrella/message/Constants.java
@@ -2,7 +2,6 @@
 package de.srsoftware.umbrella.message;
 
 public class Constants {
-	public static final String AUTH = "mail.smtp.auth";
 
 	public static final String CONFIG_DB = "umbrella.modules.message.database";
 	public static final String CONFIG_SMTP_HOST = "umbrella.modules.message.smtp.host";
@@ -11,13 +10,11 @@ public class Constants {
 	public static final String CONFIG_SMTP_USER = "umbrella.modules.message.smtp.user";
 
 	public static final String DEBUG_ADDREESS = "umbrella.modules.message.debug_address";
-	public static final String ENVELOPE_FROM = "mail.smtp.from";
-	public static final String FIELD_MESSAGES = "messages";
-	public static final String FIELD_HOST = "host";
-	public static final String FIELD_PORT = "port";
-	public static final String HOST = "mail.smtp.host";
-	public static final String PORT = "mail.smtp.port";
-	public static final String SSL = "mail.smtp.ssl.enable";
+	public static final String SMTP_AUTH = "mail.smtp.auth";
+	public static final String SMTP_HOST = "mail.smtp.host";
+	public static final String SMTP_FROM = "mail.smtp.from";
+	public static final String SMTP_PORT = "mail.smtp.port";
+	public static final String SMTP_SSL = "mail.smtp.ssl.enable";
 	public static final String SUBMISSION = "submission";
 
 }
diff --git a/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java b/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java
index 32261f32..e12a7461 100644
--- a/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java
+++ b/messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java
@@ -317,11 +317,11 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
 	private Session session() {
 		if (session == null){
 			Properties props = new Properties();
-			props.put(HOST, host);
-			props.put(PORT, port);
-			props.put(AUTH, true);
-			props.put(SSL, true);
-			props.put(ENVELOPE_FROM,from);
+			props.put(SMTP_HOST, host);
+			props.put(SMTP_PORT, port);
+			props.put(SMTP_AUTH, true);
+			props.put(SMTP_SSL, true);
+			props.put(SMTP_FROM,from);
 			session = Session.getInstance(props);
 		}
 		return session;