--- rpms/e-smith-email/sme8/e-smith-email.spec	2007/06/26 18:35:57	1.3
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2008/02/11 19:00:28	1.3.2.2
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - em
 %define name e-smith-email
 Name: %{name}
 %define version 4.16.0
-%define release 22
+%define release 24
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,6 +28,8 @@ Patch16: e-smith-email-4.16.0-uriencode.
 Patch17: e-smith-email-4.16.0-uriencode.patch2
 Patch18: e-smith-email-4.16.0-spamreject.patch
 Patch19: e-smith-email-4.16.0-purge-junkmail.patch
+Patch20: e-smith-email-4.17.0-VisibleInternal.patch
+Patch21: e-smith-email-4.16.0-rmDuplicates.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -51,6 +53,12 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Sun Feb 10 2008 Gavin Weight <gweight@gmail.com> 4.16.0-24
+- Backport remove duplicates <base> entries. [SME: 3892]
+
+* Thu Jan 17 2008 Federico Simoncelli <federico.simoncelli@gmail.com> 4.16.0-23
+- add visible internal toggle to pseudonym panel [SME: 3497]
+
 * Mon Jun 25 2007 Charlie Brady <charlie_brady@mitel.com> 4.16.0-22
 - Add diagnostic if .junkmail Maildir is broken. [SME: 2739]
 
@@ -1316,6 +1324,8 @@ e-smith server and gateway software - em
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 perl createlinks