diff --git a/alias_patch.diff b/alias_patch.diff
index a76a5c4..0d44668 100644
--- a/alias_patch.diff
+++ b/alias_patch.diff
@@ -228,7 +228,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
  using namespace std;
  
  extern ECConfig *g_lpConfig;
-@@ -1688,7 +1690,7 @@
+@@ -1758,7 +1760,7 @@
   */
  HRESULT CheckSendAs(IAddrBook *lpAddrBook, IMsgStore *lpUserStore, IMAPISession *lpAdminSession, ECSender *lpMailer,
  					ULONG ulOwnerCB, LPENTRYID lpOwnerEID, ULONG ulRepresentCB, LPENTRYID lpRepresentEID,
@@ -237,7 +237,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
  {
  	HRESULT hr = hrSuccess;
  	bool bAllowed = false;
-@@ -1700,10 +1702,9 @@
+@@ -1770,10 +1772,9 @@
  	LPSPropValue lpRepresentProps = NULL;
  	SPropValue sSpoofEID = {0};
  	ULONG ulCmpRes = 0;
@@ -249,7 +249,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
  	hr = SMTPToZarafa(lpAddrBook, ulRepresentCB, lpRepresentEID, &sSpoofEID.Value.bin.cb, (LPENTRYID*)&sSpoofEID.Value.bin.lpb);
  	if (hr != hrSuccess)
  		hr = ContactToZarafa(lpUserStore, lpAddrBook, ulRepresentCB, lpRepresentEID, &sSpoofEID.Value.bin.cb, (LPENTRYID*)&sSpoofEID.Value.bin.lpb);
-@@ -1740,6 +1741,18 @@
+@@ -1810,6 +1811,18 @@
  
  	if (lpRepresentProps[2].ulPropTag != PR_DISPLAY_TYPE) {	// Required property for a mailuser object
  		hr = MAPI_E_NOT_FOUND;
@@ -268,7 +268,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
  		goto exit;
  	}
  	bHasStore = (lpRepresentProps[2].Value.l == DT_MAILUSER);
-@@ -2096,6 +2109,15 @@
+@@ -2166,6 +2179,15 @@
  	ULONG ulResult = 0;
  
  	ArchiveResult	archiveResult;
@@ -284,7 +284,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
  
  	sending_options sopt;
  
-@@ -2264,7 +2286,7 @@
+@@ -2334,7 +2356,7 @@
  				if (!bAllowDelegate) {
  
  					hr = CheckSendAs(lpAddrBook, lpUserStore, lpAdminSession, lpMailer, lpPropOwner->Value.bin.cb, (LPENTRYID)lpPropOwner->Value.bin.lpb,
@@ -293,7 +293,7 @@ diff -ruN --exclude=.svn spooler/mailer.cpp ZARAFA_SPOOLER/mailer.cpp
  					if (hr != hrSuccess)
  						goto exit;
  
-@@ -2293,7 +2315,6 @@
+@@ -2363,7 +2385,6 @@
  	sPropSender[1].Value.LPSZ = _T("ZARAFA");
  	sPropSender[2].ulPropTag = PR_SENDER_EMAIL_ADDRESS_W;
  	sPropSender[2].Value.LPSZ = lpUser->lpszMailAddress;
@@ -325,7 +325,7 @@ diff -ruN --exclude=.svn spooler/Makefile.in ZARAFA_SPOOLER/Makefile.in
  zarafa_spooler_OBJECTS = $(am_zarafa_spooler_OBJECTS)
  zarafa_spooler_DEPENDENCIES = ${top_builddir}/inetmapi/libinetmapi.la \
  	${top_builddir}/mapi4linux/src/libmapi.la \
-@@ -388,7 +388,7 @@
+@@ -391,7 +391,7 @@
  	$(PROG_LIBS) $(PYTHON_LIBS)
  
  zarafa_dagent_SOURCES = DAgent.cpp rules.cpp rules.h LMTP.cpp LMTP.h archive.cpp archive.h PyMapiPlugin.cpp PyMapiPlugin.h PythonSWIGRuntime.h
@@ -334,7 +334,7 @@ diff -ruN --exclude=.svn spooler/Makefile.in ZARAFA_SPOOLER/Makefile.in
  BUILT_SOURCES = PythonSWIGRuntime.h
  CLEANFILES = PythonSWIGRuntime.h
  EXTRA_DIST = PythonSWIGRuntime.h
-@@ -489,6 +489,7 @@
+@@ -492,6 +492,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Spooler.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/archive.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailer.Po@am__quote@
@@ -384,7 +384,7 @@ diff -ruN --exclude=.svn spooler/README.txt ZARAFA_SPOOLER/README.txt
 diff -ruN --exclude=.svn spooler/Spooler.cpp ZARAFA_SPOOLER/Spooler.cpp
 --- spooler/Spooler.cpp	2013-02-28 17:13:18.000000000 +0100
 +++ ZARAFA_SPOOLER/Spooler.cpp	2013-04-27 13:15:02.096661200 +0200
-@@ -1141,6 +1141,8 @@
+@@ -1142,6 +1142,8 @@
          { "plugin_enabled", "yes" },
          { "plugin_path", "/var/lib/zarafa/spooler/plugins" },
          { "plugin_manager_path", "/usr/share/zarafa-spooler/python" },