diff --git a/NEWS b/NEWS
index fb8dbe170..a913eaf65 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ http://trac.transmissionbt.com/query?group=component&milestone=1.40
    + Simplify the RPC whitelist
 - Mac
    + Option to automatically update the blocklist weekly
+   + In the file inspector tab, show progress and size for folders
    + Sparkle updated to 1.5
 - GTK+
    + Option to automatically update the blocklist weekly
diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m
index cec7e2ff8..a1026d6f2 100644
--- a/macosx/FileNameCell.m
+++ b/macosx/FileNameCell.m
@@ -35,11 +35,12 @@
 #define PADDING_BETWEEN_IMAGE_AND_TITLE 4.0
 #define PADDING_ABOVE_TITLE_FILE 2.0
 #define PADDING_BELOW_STATUS_FILE 2.0
+#define PADDING_BETWEEN_NAME_AND_FOLDER_STATUS 4.0
 
 @interface FileNameCell (Private)
 
 - (NSRect) rectForTitleWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
-- (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
+- (NSRect) rectForStatusWithString: (NSAttributedString *) string withTitleRect: (NSRect) titleRect inBounds: (NSRect) bounds;
 
 - (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
 - (NSAttributedString *) attributedStatusWithColor: (NSColor *) color;
@@ -129,7 +130,9 @@
 
 - (NSRect) statusRectForBounds: (NSRect) bounds
 {
-    return [self rectForStatusWithString: [self attributedStatusWithColor: nil] inBounds: bounds];
+    return [self rectForStatusWithString: [self attributedStatusWithColor: nil]
+            withTitleRect: [(FileListNode *)[self objectValue] isFolder] ? [self titleRectForBounds: bounds] : NSZeroRect
+            inBounds: bounds];
 }
 
 - (void) drawWithFrame: (NSRect) cellFrame inView: (NSView *) controlView
@@ -142,8 +145,7 @@
     if ([self isHighlighted]
             && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
         specialColor = [NSColor whiteColor];
-    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles:
-                [(FileListNode *)[self objectValue] indexes]] == NSOffState)
+    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles: [(FileListNode *)[self objectValue] indexes]] == NSOffState)
         specialColor = [NSColor disabledControlTextColor];
     else;
     
@@ -152,12 +154,9 @@
     [titleString drawInRect: titleRect];
     
     //status
-    if (![(FileListNode *)[self objectValue] isFolder])
-    {
-        NSAttributedString * statusString = [self attributedStatusWithColor: specialColor ? specialColor : [NSColor darkGrayColor]];
-        NSRect statusRect = [self rectForStatusWithString: statusString inBounds: cellFrame];
-        [statusString drawInRect: statusRect];
-    }
+    NSAttributedString * statusString = [self attributedStatusWithColor: specialColor ? specialColor : [NSColor darkGrayColor]];
+    NSRect statusRect = [self rectForStatusWithString: statusString withTitleRect: titleRect inBounds: cellFrame];
+    [statusString drawInRect: statusRect];
 }
 
 @end
@@ -186,18 +185,24 @@
     return result;
 }
 
-- (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
+- (NSRect) rectForStatusWithString: (NSAttributedString *) string withTitleRect: (NSRect) titleRect inBounds: (NSRect) bounds;
 {
-    if ([(FileListNode *)[self objectValue] isFolder])
-        return NSZeroRect;
-    
     NSSize statusSize = [string size];
     
-    NSRect result = bounds;
-    
-    result.origin.x += PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
-    result.origin.y += result.size.height - PADDING_BELOW_STATUS_FILE - statusSize.height;
+    NSRect result;
     
+    if (![(FileListNode *)[self objectValue] isFolder])
+    {
+        result = bounds;
+        result.origin.x += PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
+        result.origin.y += result.size.height - PADDING_BELOW_STATUS_FILE - statusSize.height;
+    }
+    else
+    {
+        result.origin.x = NSMaxX(titleRect) + PADDING_BETWEEN_NAME_AND_FOLDER_STATUS;
+        result.origin.y = NSMaxY(titleRect) - statusSize.height - 1.0;
+    }
+        
     result.size = statusSize;
     result.size.width = MIN(result.size.width, NSMaxX(bounds) - result.origin.x - PADDING_HORIZONAL);
     
@@ -220,10 +225,14 @@
     
     Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
     FileListNode * node = (FileListNode *)[self objectValue];
-    float percent = [torrent fileProgress: [[node indexes] firstIndex]] * 100.0;
     
-    NSString * status = [NSString localizedStringWithFormat: NSLocalizedString(@"%.2f%% of %@",
-                            "Inspector -> Files tab -> file status string"), percent, [NSString stringForFileSize: [node size]]];
+    NSString * percentString;
+    float progress = [torrent fileProgress: node];
+    percentString = progress == 1.0 ? @"100%" : [NSString localizedStringWithFormat: @"%.2f%%", progress * 100.0];
+    
+    
+    NSString * status = [NSString localizedStringWithFormat: NSLocalizedString(@"%@ of %@",
+                            "Inspector -> Files tab -> file status string"), percentString, [NSString stringForFileSize: [node size]]];
     
     return [[[NSAttributedString alloc] initWithString: status attributes: fStatusAttributes] autorelease];
 }
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index d85bc3e63..de76b9dd6 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -1631,7 +1631,7 @@ typedef enum
     if (![[NSFileManager defaultManager] fileExistsAtPath: [[torrent downloadFolder] stringByAppendingPathComponent: [item fullPath]]])
         return NO;
     
-    return [item isFolder] || [torrent fileProgress: [[item indexes] firstIndex]] == 1.0;
+    return [item isFolder] || [torrent fileProgress: item] == 1.0;
 }
 
 - (void) addTrackers
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 46af0daf8..9c30df9a9 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -25,6 +25,8 @@
 #import <Cocoa/Cocoa.h>
 #import <transmission.h>
 
+@class FileListNode;
+
 #define INVALID -99
 
 typedef enum
@@ -240,7 +242,7 @@ typedef enum
 - (void) updateFileStat;
 
 //methods require fileStats to have been updated recently to be accurate
-- (float) fileProgress: (int) index;
+- (float) fileProgress: (FileListNode *) node;
 - (BOOL) canChangeDownloadCheckForFile: (int) index;
 - (BOOL) canChangeDownloadCheckForFiles: (NSIndexSet *) indexSet;
 - (int) checkForFiles: (NSIndexSet *) indexSet;
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index cb5f611d7..afe9e296d 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1435,12 +1435,25 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     fFileStat = tr_torrentFiles(fHandle, NULL);
 }
 
-- (float) fileProgress: (int) index
+- (float) fileProgress: (FileListNode *) node
 {
+    if ([self isComplete])
+        return 1.0;
+    
     if (!fFileStat)
         [self updateFileStat];
-        
-    return fFileStat[index].progress;
+    
+    NSIndexSet * indexSet = [node indexes];
+    
+    if (![node isFolder])
+        return fFileStat[[indexSet firstIndex]].progress;
+    
+    uint64_t have = 0;
+    int index;
+    for (index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
+        have += fFileStat[index].bytesCompleted;
+    
+    return (float)have / [node size];
 }
 
 - (BOOL) canChangeDownloadCheckForFile: (int) index