diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 857fe71c8..06cfe3975 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -101,12 +101,8 @@ static NSMutableCharacterSet *urlStartChars = nil;
 
   newName = [NSMutableString stringWithString: @"dav"];
   components = [[self componentsSeparatedByString: @"-"] objectEnumerator];
-  component = [components nextObject];
-  while (component)
-    {
-      [newName appendString: [component capitalizedString]];
-      component = [components nextObject];
-    }
+  while ((component = [components nextObject]))
+    [newName appendString: [component capitalizedString]];
 
   return newName;
 }