diff --git a/macosx/InfoTabButtonCell.m b/macosx/InfoTabButtonCell.m
index 71cd7869f..d8a884341 100644
--- a/macosx/InfoTabButtonCell.m
+++ b/macosx/InfoTabButtonCell.m
@@ -36,13 +36,11 @@
 - (void) setIcon: (NSImage *) image
 {
     //create regular back image
-    if (fRegularImage)
-        [fRegularImage release];
+    [fRegularImage release];
     fRegularImage = [[NSImage imageNamed: @"InfoTabBack.tif"] copy];
     
     //create selected back image
-    if (fSelectedImage)
-        [fSelectedImage release];
+    [fSelectedImage release];
     fSelectedImage = [[NSImage imageNamed: @"InfoTabBackAqua.tif"] copy];
     
     //composite image to back images
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index 96bde892f..d3199b97d 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -185,9 +185,10 @@
     NSIndexSet * indexes = [fMessageTable selectedRowIndexes];
     NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: [indexes count]];
     
-    unsigned int i;
-    for (i = [indexes firstIndex]; i != NSNotFound; i = [indexes indexGreaterThanIndex: i])
-        [messageStrings addObject: [self stringForMessage: [fMessages objectAtIndex: i]]];
+    NSEnumerator * enumerator = [[fMessages objectsAtIndexes: indexes] objectEnumerator];
+    NSDictionary * message;
+    while ((message = [enumerator nextObject]))
+        [messageStrings addObject: [self stringForMessage: message]];
     
     [pb setString: [messageStrings componentsJoinedByString: @"\n"] forType: NSStringPboardType];
 }