diff --git a/.classpath b/.classpath
index 8eb78c7..9a18879 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry exported="true" kind="lib" path="mysql-connector-java-8.0.28.jar"/>
@@ -13,5 +17,6 @@
 	<classpathentry kind="lib" path="Treasure.jar"/>
 	<classpathentry exported="true" kind="lib" path="JDA-5.0.0-beta.8-withDependencies.jar"/>
 	<classpathentry exported="true" kind="lib" path="PeerAtCodeFramework.jar"/>
+	<classpathentry kind="lib" path="jakarta.mail-api-2.1.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index c5a661b..38fb1c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ config.txt
 dist/
 testApi/
 .apt_generated/*
+/.apt_generated/
diff --git a/src/dev/peerat/backend/Configuration.java b/src/dev/peerat/backend/Configuration.java
index 41c3bf9..02322ab 100644
--- a/src/dev/peerat/backend/Configuration.java
+++ b/src/dev/peerat/backend/Configuration.java
@@ -29,6 +29,12 @@ public class Configuration {
 	
 	private int groupJoinMinutes;
 	private String groupQuitMinutes;
+	
+	private String mailUsername;
+	private String mailPassword;
+	private String mailSmtpHost;
+	private String mailSmptPort;
+	private String mailFromAddress;	
 
 	private File file;
 
@@ -173,4 +179,13 @@ public class Configuration {
 	public String getGroupQuitMinutes(){
 		return this.groupQuitMinutes;
 	}
+	
+	public MailConfiguration getMailConfiguration(){
+		return new MailConfiguration(
+				this.mailUsername,
+				this.mailPassword,
+				this.mailSmtpHost,
+				this.mailSmptPort,
+				this.mailFromAddress);
+	}
 }
\ No newline at end of file