Index: /WAeUP_SRP/trunk/skins/waeup_default/mail2admin.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/mail2admin.py	(revision 821)
+++ /WAeUP_SRP/trunk/skins/waeup_default/mail2admin.py	(revision 822)
@@ -16,12 +16,12 @@
 
 message = """
-From: %s
+From: %s <%s>
 To: %s
-Bcc: %s
-Subject: Test Email from a Student
+Bcc: %s, %s
+Reply-To: %s
+Subject: WAeUP Contact Form 
 
 Fullname: %s
 Student ID: %s
-Email: %s
 Problem Type: %s
 Description: %s
@@ -29,11 +29,15 @@
 """
 
+#prop.email_from_address should be used for To:
+
 msg = message % (
-     prop.email_from_address,
+     fullname,
+     email,
      'henrik@saoas.org', 
      'henrik@waeup.org',
+     'js@aixtraware.de',
+     email,
      fullname,
      studentid,
-     email,
      probtype,
      descr,
