diff --git a/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib b/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib
index 2ba8b0633..b85d0175a 100644
Binary files a/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib and b/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib differ
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index 75975f233..2b33d2238 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -30,7 +30,7 @@
 #define LEVEL_DEBUG 2
 
 #define UPDATE_SECONDS  0.6
-//#define MAX_LINES       2500
+#define MAX_MESSAGES    2500
 
 @interface MessageWindowController (Private)
 
@@ -130,14 +130,17 @@
                 [[fTextView textStorage] deleteCharactersInRange: NSMakeRange(0, loc + 1)];
         }*/
         
-        #warning remove old messages?
-        
         [fMessages addObject: [NSDictionary dictionaryWithObjectsAndKeys:
                                 [NSString stringWithUTF8String: currentMessage->message], @"Message",
                                 [NSDate dateWithTimeIntervalSince1970: currentMessage->when], @"Date",
                                 levelString, @"Level", nil]];
     }
     
+    #warning still needed?
+    int total = [fMessages count];
+    if (total > MAX_MESSAGES)
+        [fMessages removeObjectsInRange: NSMakeRange(0, total-MAX_MESSAGES)];
+    
     [fMessageView reloadData];
     
     tr_freeMessageList(messages);