diff --git a/macosx/English.lproj/InfoWindow.nib/classes.nib b/macosx/English.lproj/InfoWindow.nib/classes.nib
index df8acf1df..096b7661e 100644
--- a/macosx/English.lproj/InfoWindow.nib/classes.nib
+++ b/macosx/English.lproj/InfoWindow.nib/classes.nib
@@ -19,7 +19,7 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
                 fAnnounceField = NSTextField; 
-                fCommentField = NSTextField; 
+                fCommentView = NSTextView; 
                 fConnectedPeersField = NSTextField; 
                 fCreatorField = NSTextField; 
                 fDataLocationField = NSTextField; 
diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index bbef6fe2e..0e1c6f165 100644
Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ
diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index 3d5385fd3..6da97fb30 100644
--- a/macosx/InfoWindowController.h
+++ b/macosx/InfoWindowController.h
@@ -38,13 +38,14 @@
     IBOutlet NSImageView * fImageView;
     IBOutlet NSTextField * fNameField, * fSizeField, * fTrackerField,
                         * fAnnounceField, * fPieceSizeField, * fPiecesField,
-                        * fHashField, * fCommentField,
+                        * fHashField,
                         * fTorrentLocationField, * fDataLocationField,
                         * fDateStartedField,
                         * fCreatorField, * fDateCreatedField,
                         * fStateField,
                         * fDownloadedValidField, * fDownloadedTotalField, * fUploadedTotalField,
-                        * fRatioField, * fSwarmSpeedField; 
+                        * fRatioField, * fSwarmSpeedField;
+    IBOutlet NSTextView * fCommentView;
     IBOutlet NSButton * fRevealDataButton, * fRevealTorrentButton;
 
     IBOutlet NSTableView * fPeerTable;
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index b1cf5dd5b..7ad86529a 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -39,7 +39,7 @@
 #define TAB_OPTIONS_IDENT @"Options"
 
 //15 spacing at the bottom of each tab
-#define TAB_INFO_HEIGHT 255.0
+#define TAB_INFO_HEIGHT 297.0
 #define TAB_ACTIVITY_HEIGHT 109.0
 #define TAB_PEERS_HEIGHT 260.0
 #define TAB_FILES_HEIGHT 260.0
@@ -157,8 +157,7 @@
         [fPiecesField setStringValue: @""];
         [fHashField setStringValue: @""];
         [fHashField setToolTip: nil];
-        [fCommentField setStringValue: @""];
-        [fCommentField setToolTip: @""];
+        [fCommentView setString: @""];
         
         [fCreatorField setStringValue: @""];
         [fDateCreatedField setStringValue: @""];
@@ -176,7 +175,6 @@
         [fTrackerField setSelectable: NO];
         [fAnnounceField setSelectable: NO];
         [fHashField setSelectable: NO];
-        [fCommentField setSelectable: NO];
         [fCreatorField setSelectable: NO];
         [fTorrentLocationField setSelectable: NO];
         [fDataLocationField setSelectable: NO];
@@ -219,8 +217,7 @@
         [fPiecesField setIntValue: [torrent pieceCount]];
         [fHashField setStringValue: hashString];
         [fHashField setToolTip: hashString];
-        [fCommentField setStringValue: commentString];
-        [fCommentField setToolTip: commentString];
+        [fCommentView setString: commentString];
         
         [fCreatorField setStringValue: [torrent creator]];
         [fDateCreatedField setObjectValue: [torrent dateCreated]];
@@ -244,7 +241,7 @@
         [fTrackerField setSelectable: YES];
         [fAnnounceField setSelectable: YES];
         [fHashField setSelectable: YES];
-        [fCommentField setSelectable: YES];
+        [fCommentView setSelectable: YES];
         [fCreatorField setSelectable: YES];
         [fTorrentLocationField setSelectable: YES];
         [fDataLocationField setSelectable: YES];