diff --git a/macosx/InfoPeersView.xib b/macosx/InfoPeersView.xib
index e243847cf..3f28d9899 100644
--- a/macosx/InfoPeersView.xib
+++ b/macosx/InfoPeersView.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="9"/>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -667,7 +667,7 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes>
 												<int key="NSResizingMask">3</int>
 												<bool key="NSIsResizeable">YES</bool>
 												<reference key="NSTableView" ref="804988141"/>
-												<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+												<object class="NSSortDescriptor" key="NSSortDescriptorPrototype" id="946902179">
 													<string key="NSKey">Address</string>
 													<bool key="NSAscending">YES</bool>
 													<string key="NSSelector">localizedCaseInsensitiveCompare:</string>
@@ -718,6 +718,10 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes>
 										<reference key="NSDelegate"/>
 										<reference key="NSDataSource"/>
 										<string key="NSAutosaveName">InspectorTableWebSeeds</string>
+										<object class="NSArray" key="NSSortDescriptors">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="946902179"/>
+										</object>
 										<int key="NSColumnAutoresizingStyle">1</int>
 										<int key="NSDraggingSourceMaskForLocal">15</int>
 										<int key="NSDraggingSourceMaskForNonLocal">0</int>
diff --git a/macosx/InfoPeersViewController.m b/macosx/InfoPeersViewController.m
index ee53cb50e..edc0d7ab1 100644
--- a/macosx/InfoPeersViewController.m
+++ b/macosx/InfoPeersViewController.m
@@ -47,16 +47,6 @@
 
 - (void) awakeFromNib
 {
-    //initially sort peer table by IP
-    if ([[fPeerTable sortDescriptors] count] == 0)
-        [fPeerTable setSortDescriptors: [NSArray arrayWithObject: [[fPeerTable tableColumnWithIdentifier: @"IP"]
-                                            sortDescriptorPrototype]]];
-    
-    //initially sort webseed table by address
-    if ([[fWebSeedTable sortDescriptors] count] == 0)
-        [fWebSeedTable setSortDescriptors: [NSArray arrayWithObject: [[fWebSeedTable tableColumnWithIdentifier: @"Address"]
-                                            sortDescriptorPrototype]]];
-    
     //set table header text
     [[[fPeerTable tableColumnWithIdentifier: @"IP"] headerCell] setStringValue: NSLocalizedString(@"IP Address",
                                                                         "inspector -> peer table -> header")];
@@ -484,7 +474,6 @@
 
 - (void) setWebSeedTableHidden: (BOOL) hide animate: (BOOL) animate
 {
-    #warning needs to be verified
     if (animate && (![[self view] window] || ![[[self view] window] isVisible]))
         animate = NO;
     
diff --git a/macosx/MessageWindow.xib b/macosx/MessageWindow.xib
index 9a5d114f5..d233f7214 100644
--- a/macosx/MessageWindow.xib
+++ b/macosx/MessageWindow.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="72"/>
+			<integer value="66"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -552,7 +552,7 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes>
 													<int key="NSResizingMask">2</int>
 													<bool key="NSIsResizeable">YES</bool>
 													<reference key="NSTableView" ref="422137489"/>
-													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype" id="911077036">
 														<string key="NSKey">Index</string>
 														<bool key="NSAscending">YES</bool>
 														<string key="NSSelector">compare:</string>
@@ -647,6 +647,10 @@ AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA</bytes>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
 											<string key="NSAutosaveName">LogTableView</string>
+											<object class="NSArray" key="NSSortDescriptors">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<reference ref="911077036"/>
+											</object>
 											<int key="NSColumnAutoresizingStyle">4</int>
 											<int key="NSDraggingSourceMaskForLocal">15</int>
 											<int key="NSDraggingSourceMaskForNonLocal">0</int>
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index e5af63b9c..e2bd1c0ac 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -75,11 +75,6 @@
     
     [window setContentBorderThickness: NSMinY([[fMessageTable enclosingScrollView] frame]) forEdge: NSMinYEdge];
     
-    //initially sort peer table by date
-    if ([[fMessageTable sortDescriptors] count] == 0)
-        [fMessageTable setSortDescriptors: [NSArray arrayWithObject: [[fMessageTable tableColumnWithIdentifier: @"Date"]
-                                            sortDescriptorPrototype]]];
-    
     [[self window] setTitle: NSLocalizedString(@"Message Log", "Message window -> title")];
     
     //set images and text for popup button items