--- rpms/e-smith-email/sme7/e-smith-email.spec	2008/04/28 19:19:19	1.12
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2008/07/28 18:23:52	1.14
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - em
 %define name e-smith-email
 Name: %{name}
 %define version 4.18.0
-%define release 3
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,6 +10,7 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-email-4.18.0-fixADD.patch
 Patch2: e-smith-email-4.18.0-add2general.patch
+Patch3: e-smith-email-4.18.0-FixSpecialCharactersPseudonyms.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -35,6 +36,13 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Mon Jul 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-5
+- Fix patch to be in accordance with conventions in e-smith-formagick's general [SME: 4285]
+
+* Sat Jul 26 2008 Gavin Weight <gweight@gmail.com> 4.18.0-4
+- Fix pseudonyms modify if using special characters. Thanks - 
+  Federico Simoncelli. [SME: 4346]
+
 * Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-3
 - Add common <base> tags to e-smith-formmagick's general [SME: 4285]
 
@@ -1313,6 +1321,7 @@ e-smith server and gateway software - em
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks