From cbd22762c35f73a8c2c3a81d7d47169a4f3c5753 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 10 Mar 2014 14:47:01 -0400
Subject: [PATCH] Fix possible exception when retrieving reminder

Fixes #2647
Fixes #2648
---
 NEWS                              | 12 +++++++++---
 UI/PreferencesUI/UIxPreferences.m |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index e136b03b2..5cf750552 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.2.X (2014-03-DD)
+------------------
+
+Bug fixes
+ - fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2647, #2648)
+
 2.2.1 (2014-03-07)
 ------------------
 
@@ -13,9 +19,9 @@ Bug fixes
  - fixed wrong date format leading to Android email syncing issues (#2609)
  - fixed possible exception when retrieving the default event reminder value (#2624)
  - fixed encoding of mail folder name when creating a subfolder (#2637)
- - fixed returned date format for email messages in Active Sync
- - fixed missing 'name part' in address for email messages in Active Sync
- - fixed race condition when syncing huge amount of deleted messages over Active Sync
+ - fixed returned date format for email messages in ActiveSync
+ - fixed missing 'name part' in address for email messages in ActiveSync
+ - fixed race condition when syncing huge amount of deleted messages over ActiveSync
  - fixed encoding of string as CSS identifier when the string starts with a digit
  - fixed auto-completion popupmenu when UID is a digit
 
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 7ba612cac..8cf025796 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -568,7 +568,7 @@ static NSArray *reminderValues = nil;
 - (NSString *) reminder
 {
   NSString *value;
-  int index;
+  NSUInteger index;
 
   value = [userDefaults calendarDefaultReminder];
   if (value != nil)