diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m
index a53378a5c..2076e63b1 100644
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@@ -258,15 +258,7 @@ static NSString *commaSeparator = nil;
 
 - (BOOL) isAllDayDate
 {
-  unsigned int length;
-  unichar lastZ;
-
-  length = [self length];
-  lastZ = [self characterAtIndex: length - 1];
-
-  return (length == 8
-	  || (length == 9
-	      && (lastZ == 'Z' || lastZ == 'z')));
+  return ([self length] == 8);
 }
 
 - (NSArray *) commaSeparatedValues
diff --git a/SOPE/NGCards/iCalDateTime.m b/SOPE/NGCards/iCalDateTime.m
index bf18fd8a8..6391d748b 100644
--- a/SOPE/NGCards/iCalDateTime.m
+++ b/SOPE/NGCards/iCalDateTime.m
@@ -109,10 +109,10 @@
           tmpTime = [dateTime copy];
           [tmpTime setTimeZone: utcTZ];
 	  if (forAllDayEntity)
-	    fmtTimeString = [tmpTime iCalFormattedDateString];
+	    timeString = [tmpTime iCalFormattedDateString];
 	  else
-	    fmtTimeString = [tmpTime iCalFormattedDateTimeString];
-	  timeString = [NSString stringWithFormat: @"%@Z", fmtTimeString];
+	    timeString = [NSString stringWithFormat: @"%@Z",
+				   [tmpTime iCalFormattedDateTimeString]];
           [tmpTime release];
         }
     }