Index: /WAeUP_SRP/trunk/skins/waeup_student/mail2student.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/mail2student.py	(revision 908)
+++ /WAeUP_SRP/trunk/skins/waeup_student/mail2student.py	(revision 909)
@@ -26,9 +26,16 @@
 
 #prop.email_from_address should be used for To:
-
+REQUEST = context.REQUEST
+url_tuple = REQUEST.HTTP_REFERER.split('?')
+if len(url_tuple) == 2:
+    url_tuple[1] ='portal_status_message=Your message has been sent!'
+else:
+    url_tuple.append('portal_status_message=Your message has been sent!')
+redirect_url = "?".join(url_tuple)
+REQUEST.set('rurl', redirect_url) # to see the result in the error log
 msg = message % (
      co_name,
      co_email,
-     student_email,	
+     student_email,  
      co_email,
      'henrik@waeup.org',
@@ -43,5 +50,3 @@
 RESPONSE = REQUEST.RESPONSE
 
-redirect_url = REQUEST.HTTP_REFERER
-redirect_url = '%s/?%s' % (redirect_url,'portal_status_message=Your message has been sent!')
 RESPONSE.redirect(redirect_url)
