$OpenBSD$
--- SOPE/NGCards/CardGroup.m.orig	Tue Mar  6 10:22:47 2012
+++ SOPE/NGCards/CardGroup.m	Tue Mar  6 10:23:04 2012
@@ -391,7 +391,7 @@ static NGCardsSaxHandler *sax = nil;
 - (void) replaceThisElement: (CardElement *) oldElement
                 withThisOne: (CardElement *) newElement
 {
-  unsigned int index;
+  NSUInteger index;
 
   index = [children indexOfObject: oldElement];
   if (index != NSNotFound)
$OpenBSD$
--- SoObjects/Mailer/SOGoMailObject+Draft.m.orig	Tue Mar  6 10:34:47 2012
+++ SoObjects/Mailer/SOGoMailObject+Draft.m	Tue Mar  6 10:35:55 2012
@@ -98,7 +98,7 @@
   NSArray *types;
   NSDictionary *parts;
   NSString *rawPart, *content, *contentKey;
-  int index;
+  NSInteger index;
   BOOL htmlContent;
 
   content = @"";
$OpenBSD$
--- SoObjects/SOGo/NSString+Utilities.m.orig	Tue Mar  6 10:24:38 2012
+++ SoObjects/SOGo/NSString+Utilities.m	Tue Mar  6 10:25:17 2012
@@ -470,7 +470,8 @@ static int cssEscapingCount;
 
 - (int) timeValue
 {
-  int i, time;
+  int 		time;
+  NSInteger 	i;
 
   if ([self length] > 0)
     {
$OpenBSD$
--- UI/MailPartViewers/UIxMailPartAlternativeViewer.m.orig	Tue Feb 14 22:31:30 2012
+++ UI/MailPartViewers/UIxMailPartAlternativeViewer.m	Tue Mar  6 10:51:40 2012
@@ -89,10 +89,10 @@
   return types;
 }
 
-- (unsigned int) _preferredTypesPart: (NSArray *) types
+- (NSUInteger) _preferredTypesPart: (NSArray *) types
 {
   unsigned int count, max;
-  unsigned int part;
+  NSUInteger part;
   const NSString *priorities[] = { @"multipart/related", @"multipart/mixed",
 				   @"text/calendar", @"text/html",
 				   @"text/plain" };
@@ -113,7 +113,8 @@
 - (int) _selectPartIndexFromTypes: (NSArray *) _types
 {
   /* returns the index of the selected part or NSNotFound */
-  unsigned count, max, part;
+  unsigned count, max;
+  NSUInteger part;
 
   part = [self _preferredTypesPart: _types];
   if (part == NSNotFound)
@@ -136,7 +137,7 @@
 
 - (void) selectChildInfo
 {
-  unsigned idx;
+  NSUInteger idx;
 
   [childInfo release]; childInfo = nil;
   childIndex = 0;
$OpenBSD$
--- UI/MailerUI/UIxMailEditor.m.orig	Sun Jan 22 14:29:40 2012
+++ UI/MailerUI/UIxMailEditor.m	Sun Jan 22 14:30:25 2012
@@ -384,7 +384,7 @@ static NSArray *infoKeys = nil;
 {
   if (![_info isNotNull]) return;
   [self debugWithFormat:@"loading info ..."];
-  [self takeValuesFromDictionary:_info];
+  [self setValuesForKeysWithDictionary:_info];
 }
 
 - (NSDictionary *) storeInfo
$OpenBSD$
--- UI/MailerUI/UIxMailMainFrame.m.orig	Mon Mar  5 19:59:23 2012
+++ UI/MailerUI/UIxMailMainFrame.m	Mon Mar  5 19:59:43 2012
@@ -549,7 +549,7 @@
   NSArray *available;
   NSDictionary *metaData;
   SOGoUserDefaults *ud;
-  unsigned int i;
+  NSUInteger i;
 
   if (!columnsOrder)
     {
$OpenBSD$
--- UI/Scheduler/UIxCalView.m.orig	Tue Mar  6 10:39:14 2012
+++ UI/Scheduler/UIxCalView.m	Tue Mar  6 10:39:03 2012
@@ -532,7 +532,8 @@
   NSString *uidsString, *loc, *prevMethod, *userFolderID;
   id <WOActionResults> r;
   BOOL useGroups;
-  unsigned index;
+  NSUInteger index;
+
 
   uidsString = [self queryParameterForKey: @"userUIDString"];
   uidsString = [uidsString stringByTrimmingSpaces];
$OpenBSD$
--- UI/Scheduler/UIxComponentEditor.m.orig	Tue Mar  6 10:39:47 2012
+++ UI/Scheduler/UIxComponentEditor.m	Tue Mar  6 10:40:10 2012
@@ -524,7 +524,7 @@ iRANGE(2);
   iCalTrigger *aTrigger;
   NSString *duration, *quantity;
   unichar c;
-  unsigned int i;
+  NSUInteger i;
 
   if ([component hasAlarms])
     {