diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header	2009-12-28 11:25:18.000000000 -0600
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/hooks.php/00header	2009-12-28 11:16:44.000000000 -0600
@@ -8,7 +8,7 @@
  *
  * For more information please see the horde/config/hooks.php.dist file.
  *
- * $Horde: imp/config/hooks.php.dist,v 1.3.2.5 2008/06/05 09:04:14 jan Exp $
+ * $Horde: imp/config/hooks.php.dist,v 1.3.2.13 2009-11-18 13:14:32 jan Exp $
  */
 
 
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header	2009-12-28 11:25:18.000000000 -0600
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/000header	2009-12-28 11:18:43.000000000 -0600
@@ -1,6 +1,6 @@
 //000preamble
 /**
- * $Horde: imp/config/prefs.php.dist,v 1.216.4.34 2008/08/28 21:03:15 slusarz Exp $
+ * $Horde: imp/config/prefs.php.dist,v 1.216.4.37 2009-11-29 05:27:14 chuck Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks	2008-04-19 22:50:45.000000000 -0500
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/075addressbooks	2009-12-28 11:20:26.000000000 -0600
@@ -1,8 +1,11 @@
 //075addressbooks
-$prefGroups['addressbooks'] = array(
-    'column' => _("Other Options"),
-    'label' => _("Address Books"),
-    'desc' => _("Select address book sources for adding and searching for addresses."),
-    'members' => array('save_recipients', 'display_contact', 'sourceselect')
-);
+$contacts_app = $GLOBALS['registry']->hasInterface('contacts');
+if ($contacts_app && $GLOBALS['registry']->hasPermission($contacts_app)) \{
+    $prefGroups['addressbooks'] = array(
+        'column' => _("Other Options"),
+        'label' => _("Address Books"),
+        'desc' => _("Select address book sources for adding and searching for addresses."),
+        'members' => array('save_recipients', 'display_contact', 'sourceselect')
+        );
+\}
 
diff -Nur -x '*.orig' -x '*.rej' e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons
--- e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons	2009-12-28 11:25:18.000000000 -0600
+++ mezzanine_patched_e-smith-imp-5.0.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/prefs.php/300fckeditor_buttons	2009-12-28 11:22:23.000000000 -0600
@@ -1,7 +1,9 @@
 //300fckeditor_buttons
 // The list of buttons to show in FCKeditor
 $_prefs['fckeditor_buttons'] = array(
-    'value' => "[['FontFormat','FontName','FontSize'],['Bold','Italic','Underline'],['TextColor','BGColor'],'/',['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],['OrderedList','UnorderedList','Outdent','Indent'],['Link'],['Undo','Redo']]",
+    'value' => "[['Source','FitWindow','-','Templates'],['Cut','Copy','Paste','PasteText','PasteWord'],['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],'/',['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],['Link','Unlink'],['Image','Flash','Table','Rule','Smiley','SpecialChar'],'/',['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],['TextColor','BGColor'],'/',['Style','FontFormat','FontName','FontSize']]",
+    // Use the following line for a very basic set of buttons:
+    // 'value' => "['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink']",
     'locked' => true,
     'shared' => false,
     'type' => 'textarea',