diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade
--- smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade	2008-05-24 17:25:14.000000000 -0500
+++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/events/actions/mnemo_upgrade	2009-10-08 15:43:25.000000000 -0500
@@ -46,6 +46,21 @@
 
 # These are all safe to run multiple times
 
+my @statements = (
+    "ALTER TABLE mnemo_memos CHANGE COLUMN memo_id memo_id VARCHAR(255) NOT NULL",
+    "ALTER TABLE mnemo_memos CHANGE COLUMN memo_category memo_category VARCHAR(80)",
+    "ALTER TABLE mnemo_memos CHANGE COLUMN memo_private memo_private SMALLINT NOT NULL default 0",
+    "ALTER TABLE mnemo_shares_groups CHANGE group_uid group_uid VARCHAR(255)"
+);
+  
+foreach my $statement (@statements)
+{
+    $statement =
+        $db_mnemohandle->prepare("$statement")
+            or die "prepare: $$statement: $DBI::errstr";
+    $statement->execute or die "execute: $$statement: $DBI::errstr";
+}
+
 # We now need to create some columns, but we need to first check
 # whether they exist already
 my $sth = $db_mnemohandle->prepare("show columns from mnemo_memos");
@@ -88,42 +103,6 @@
     $statement->execute or die "execute: $$statement: $DBI::errstr";
 }
 
-unless (defined $mnemo_memos->{memo_id})
-{
-    # We need to be careful about this one as it will fail if the 
-    # column exists, so we check the error. 
-    my $statement = 
-        "ALTER TABLE mnemo_memos CHANGE COLUMN memo_id memo_id ".
-        "VARCHAR(255) NOT NULL";
-    $statement = $db_mnemohandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
-unless (defined $mnemo_memos->{memo_category})
-{
-    # We need to be careful about this one as it will fail if the 
-    # column exists, so we check the error. 
-    my $statement = 
-        "ALTER TABLE mnemo_memos CHANGE COLUMN memo_category memo_category ".
-        "VARCHAR(80)";
-    $statement = $db_mnemohandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
-unless (defined $mnemo_memos->{memo_private})
-{
-    # We need to be careful about this one as it will fail if the 
-    # column exists, so we check the error. 
-    my $statement = 
-        "ALTER TABLE mnemo_memos CHANGE COLUMN memo_private memo_private ".
-        "SMALLINT NOT NULL default 0";
-    $statement = $db_mnemohandle->prepare($statement) or 
-        die "prepare: $$statement: $DBI::errstr";
-    $statement->execute or die "execute: $$statement: $DBI::errstr";
-}
-
 # Create an index for memo_owner if needed
 unless ($mnemo_memos->{memo_owner}->{Key})
 {
diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header
--- smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header	2009-10-08 15:44:02.000000000 -0500
+++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header	2009-10-08 15:02:58.000000000 -0500
@@ -1,7 +1,7 @@
 
 //00Header
 /**
- * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.4 2008/06/13 14:44:04 jan Exp $
+ * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.5 2009/06/19 17:06:22 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display
--- smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display	2008-04-06 23:55:40.000000000 -0500
+++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display	2009-10-08 15:04:11.000000000 -0500
@@ -3,6 +3,6 @@
     'column' => _("General Options"),
     'label' => _("Display Options"), 
     'desc' => _("Change your note sorting and display options."),
-    'members' => array('show_notepad', 'show_panel', 'sortby', 'sortdir')
+    'members' => array('show_notepad', 'sortby', 'sortdir')
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel
--- smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel	2008-04-07 00:05:18.000000000 -0500
+++ mezzanine_patched_smeserver-mnemo-2.2/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/150ShowPanel	2009-10-08 15:05:25.000000000 -0500
@@ -5,7 +5,6 @@
     'value' => 1,
     'locked' => false,
     'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Show notepad options panel?")
+    'type' => 'implicit',
 );
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql mezzanine_patched_smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql
--- smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql	2008-06-18 22:57:43.000000000 -0500
+++ mezzanine_patched_smeserver-mnemo-2.2/root/home/httpd/html/horde/smeserver/mnemo.sql	2009-10-08 15:41:47.000000000 -0500
@@ -27,7 +27,7 @@
 
 CREATE TABLE IF NOT EXISTS mnemo_shares_groups (
     share_id INT NOT NULL,
-    group_uid INT NOT NULL,
+    group_uid VARCHAR(255) NOT NULL, 
     perm SMALLINT NOT NULL
 );