diff --git a/SoObjects/Mailer/SOGoMailObject.h b/SoObjects/Mailer/SOGoMailObject.h
index 5b53c4f54..7fab49161 100644
--- a/SoObjects/Mailer/SOGoMailObject.h
+++ b/SoObjects/Mailer/SOGoMailObject.h
@@ -131,10 +131,6 @@ extern NSArray *SOGoMailCoreInfoKeys;
 /* deletion */
 
 - (BOOL) isDeletionAllowed;
-- (NSException *) copyToFolderNamed: (NSString *) folderName
-                          inContext: (id)_ctx;
-- (NSException *) moveToFolderNamed: (NSString *) folderName
-                          inContext: (id)_ctx;
 
 - (void) addRequiredKeysOfStructure: (NSDictionary *) info
                                path: (NSString *) p
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 97670dd4b..78ca794af 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -1377,66 +1377,6 @@ static BOOL debugSoParts       = NO;
 
 /* operations */
 
-- (NSException *) copyToFolderNamed: (NSString *) folderName
-                          inContext: (id)_ctx
-{
-  SOGoMailFolder *destFolder;
-  NSEnumerator *folders;
-  NSString *currentFolderName, *reason;
-
-  // TODO: check for safe HTTP method
-
-  destFolder = (SOGoMailFolder *) [self mailAccountsFolder];
-  folders = [[folderName componentsSeparatedByString: @"/"] objectEnumerator];
-  currentFolderName = [folders nextObject];
-  currentFolderName = [folders nextObject];
-
-  while (currentFolderName)
-    {
-      destFolder = [destFolder lookupName: currentFolderName
-                               inContext: _ctx
-                               acquire: NO];
-      if ([destFolder isKindOfClass: [NSException class]])
-        return (NSException *) destFolder;
-      currentFolderName = [folders nextObject];
-    }
-
-  if (!([destFolder isKindOfClass: [SOGoMailFolder class]]
-        && [destFolder isNotNull]))
-    {
-      reason = [NSString stringWithFormat: @"Did not find folder name '%@'!",
-                         folderName];
-      return [NSException exceptionWithHTTPStatus:500 /* Server Error */
-                          reason: reason];
-    }
-  [destFolder flushMailCaches];
-
-  /* a) copy */
-
-  return [self davCopyToTargetObject: destFolder
-	       newName: @"fakeNewUnusedByIMAP4" /* autoassigned */
-	       inContext:_ctx];
-}
-
-- (NSException *) moveToFolderNamed: (NSString *) folderName
-                          inContext: (id)_ctx
-{
-  NSException *error;
-
-  if (![self copyToFolderNamed: folderName
-	     inContext: _ctx])
-    {
-      /* b) mark deleted */
-
-      error = [[self imap4Connection] markURLDeleted: [self imap4URL]];
-      if (error != nil) return error;
-
-      [self flushMailCaches];
-    }
-
-  return nil;
-}
-
 - (NSException *) delete
 {
   /*
diff --git a/UI/MailerUI/UIxMailMainFrame.h b/UI/MailerUI/UIxMailMainFrame.h
index 256eb218d..abc3acf5b 100644
--- a/UI/MailerUI/UIxMailMainFrame.h
+++ b/UI/MailerUI/UIxMailMainFrame.h
@@ -46,8 +46,6 @@
 
 - (NSString *) formattedMailtoString: (NGVCard *) card;
 
-- (NSArray *) columnsDisplayOrder;
-
 @end
 
 #endif /* UIXMAILMAINFRAME_H */
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 635a3f27a..7b6be85dd 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -33,7 +33,6 @@
 #import <Contacts/SOGoContactFolders.h>
 #import <Contacts/SOGoContactLDIFEntry.h>
 
-#import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
 #import <Mailer/SOGoMailLabel.h>
@@ -448,189 +447,6 @@
   return [super defaultAction];
 }
 
-- (BOOL) showToAddress 
-{
-  SOGoMailFolder *co;
-
-  if (!folderType)
-    {
-      co = [self clientObject];
-      if ([co isKindOfClass: [SOGoSentFolder class]]
-	  || [co isKindOfClass: [SOGoDraftsFolder class]])
-	folderType = 1;
-      else
-	folderType = -1;
-    }
-
-  return (folderType == 1);
-}
-
-- (NSDictionary *) columnsMetaData
-{
-  NSMutableDictionary *columnsMetaData;
-  NSArray *tmpColumns, *tmpKeys;
-
-  columnsMetaData = [NSMutableDictionary dictionaryWithCapacity: 8];
-  
-  tmpKeys = [NSArray arrayWithObjects: @"headerClass", @"headerId", @"value",
-                     nil];
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageThreadColumn tbtv_headercell",
-               @"invisibleHeader", @"Thread", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-                                                          forKeys: tmpKeys]
-                      forKey: @"Thread"];
-
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageSubjectColumn tbtv_headercell sortableTableHeader resizable",
-               @"subjectHeader", @"Subject", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-                                                          forKeys: tmpKeys]
-                      forKey: @"Subject"];
-  
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageFlagColumn tbtv_headercell",
-	       @"invisibleHeader", @"Flagged", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-					    forKeys: tmpKeys]
-		      forKey: @"Flagged"];
-
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageFlagColumn tbtv_headercell",
-	       @"attachmentHeader", @"Attachment", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-							  forKeys: tmpKeys]
-		      forKey: @"Attachment"];
-
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageFlagColumn tbtv_headercell", @"messageFlagHeader",
-	       @"Unread", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys]
-		      forKey: @"Unread"];
-
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageAddressHeader tbtv_headercell sortableTableHeader resizable",
-	       @"toHeader", @"To", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns forKeys: tmpKeys]
-		      forKey: @"To"];
-  
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageAddressColumn tbtv_headercell sortableTableHeader resizable",
-	       @"fromHeader", @"From", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-							  forKeys: tmpKeys]
-		      forKey: @"From"];
-  
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageDateColumn tbtv_headercell sortableTableHeader resizable",
-	       @"dateHeader", @"Date", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-							  forKeys: tmpKeys]
-		      forKey: @"Date"];
-  
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messagePriorityColumn tbtv_headercell resizable", @"priorityHeader",
-	       @"Priority", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-							  forKeys: tmpKeys]
-		      forKey: @"Priority"];
-
-  tmpColumns
-    = [NSArray arrayWithObjects: @"messageSizeColumn tbtv_headercell sortableTableHeader", @"sizeHeader",
-	       @"Size", nil];
-  [columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
-							  forKeys: tmpKeys]
-		      forKey: @"Size"];
-  
-  return columnsMetaData;
-}
-
-- (NSArray *) columnsDisplayOrder
-{
-  NSMutableArray *finalOrder, *invalid;
-  NSArray *available;
-  NSDictionary *metaData;
-  SOGoUserDefaults *ud;
-  NSUInteger i;
-
-  if (!columnsOrder)
-    {
-      ud = [[context activeUser] userDefaults];
-      columnsOrder = [ud mailListViewColumnsOrder];
-
-      metaData = [self columnsMetaData];
-
-      invalid = [columnsOrder mutableCopy];
-      [invalid autorelease];
-      available = [metaData allKeys];
-      [invalid removeObjectsInArray: available];
-      if ([invalid count] > 0)
-        {
-          [self errorWithFormat: @"those column names specified in"
-                @" SOGoMailListViewColumnsOrder are invalid: '%@'",
-                [invalid componentsJoinedByString: @"', '"]];
-          [self errorWithFormat: @"  falling back on hardcoded column order"];
-          columnsOrder = available;
-        }
-
-      finalOrder = [columnsOrder mutableCopy];
-      [finalOrder autorelease];
-
-      if (![ud mailSortByThreads])
-        [finalOrder removeObject: @"Thread"];
-      else
-        {
-          i = [finalOrder indexOfObject: @"Thread"];
-          if (i == NSNotFound)
-            [finalOrder insertObject: @"Thread" atIndex: 0];
-        }
-      if ([self showToAddress])
-        {
-          i = [finalOrder indexOfObject: @"From"];
-          if (i != NSNotFound)
-	    {
-	      [finalOrder removeObject: @"To"];
-	      [finalOrder replaceObjectAtIndex: i withObject: @"To"];
-	    }
-        }
-      else
-        {
-          i = [finalOrder indexOfObject: @"To"];
-          if (i != NSNotFound)
-	    {
-	      [finalOrder removeObject: @"From"];
-	      [finalOrder replaceObjectAtIndex: i withObject: @"From"];
-	    }
-	}
-
-      columnsOrder = [[self columnsMetaData] objectsForKeys: finalOrder
-                                             notFoundMarker: @""];
-      [columnsOrder retain];
-    }
-
-  return columnsOrder;
-}
-
-- (NSString *) columnsDisplayCount
-{
-  return [NSString stringWithFormat: @"%d", (int)[[self columnsDisplayOrder] count]];
-}
-
-- (void) setCurrentColumn: (NSDictionary *) newCurrentColumn
-{
-  ASSIGN (currentColumn, newCurrentColumn);
-}
-
-- (NSDictionary *) currentColumn
-{
-  return currentColumn;
-}
-
-- (NSString *) columnTitle
-{
-  return [self labelForKey: [currentColumn objectForKey: @"value"]];
-}
-
 - (unsigned int) _unseenCountForFolder: (NSString *) theFolder
 {
   NSArray *pathComponents;