--- spooler/mailer.cpp.ori	2011-07-03 15:38:10.162737725 +0200
+++ spooler/mailer.cpp	2011-07-03 15:39:14.362790762 +0200
@@ -2172,6 +2172,8 @@
 			HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
 		{
 			bAllowSendAs = true;
+		} else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
+			bAllowSendAs = true;
 		} else {
 
 			hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
--- spooler/Spooler.cpp.ori	2011-07-03 15:46:25.366770639 +0200
+++ spooler/Spooler.cpp	2011-07-03 15:46:45.716172033 +0200
@@ -1118,6 +1118,7 @@
 		{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
 		{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
 		{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
+		{ "always_send_as", "no", CONFIGSETTING_RELOADABLE },
 		{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
 		{ "always_send_utf8", "no", CONFIGSETTING_RELOADABLE },
 		{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
--- php-webclient-ajax/client/modules/readmailitemmodule.js.ori	2011-06-22 00:02:22.000000000 +0200
+++ php-webclient-ajax/client/modules/readmailitemmodule.js	2011-07-24 01:19:03.454049593 +0200
@@ -479,7 +479,7 @@
 			dhtml.addEvent(this, recipientItemSenderRepresentation, "click", eventReadmailClickEmail);
 			dhtml.addEvent(this, recipientItemSenderRepresentation, "contextmenu", eventReadmailAddressContextMenu);
 
-			dhtml.addElement(fromElement,"span","emailaddress","", NBSP+_("on behalf of")+NBSP);
+			//dhtml.addElement(fromElement,"span","emailaddress","", NBSP+_("on behalf of")+NBSP);
 		}
 
 		var recipientItemSenderRepresentation = dhtml.addElement(fromElement,"a","emailaddress","senderrepresentatation_label",sender_representation);
--- installer/linux/spooler.ori	2011-07-03 14:41:32.934761391 +0200
+++ installer/linux/spooler.cfg	2011-07-02 18:29:54.958164996 +0200
@@ -76,7 +76,11 @@
 # delegates (other user than yourself in the From: header)
 # In installations before 6.20, this value was always 'yes'.
 # IMPORTANT: This feature overrides "send-as" functionality.
-always_send_delegates = no
+always_send_delegates = yes
+
+# Set this value to 'yes' to let the spooler always send emails even
+# if the from emailadres someone elses
+always_send_as = yes
 
 # Set this value to 'no' if you do NOT want to allow redirected e-mails
 # being sent with their original 'FROM' header