diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 108dcd741c..f2ca1065ec 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -159,6 +159,14 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 	display:inline;
 }
 
+.summary {
+	opacity: .5;
+}
+
+.summary .info {
+	margin-left: 3em;
+}
+
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
 
 div.crumb a{ padding:0.9em 0 0.7em 0; color:#555; }
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 1e94275dcb..502ddd329b 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,6 +1,14 @@
 <input type="hidden" id="disableSharing" data-status="<?php p($_['disableSharing']); ?>">
-
+<?php $totalfiles = 0;
+$totaldirs = 0;
+$totalsize = 0; ?>
 <?php foreach($_['files'] as $file):
+	$totalsize += $file['size'];
+	if ($file['type'] === 'dir') {
+		$totaldirs++;
+	} else {
+		$totalfiles++;
+	}
 	$simple_file_size = OCP\simple_file_size($file['size']);
 	// the bigger the file, the darker the shade of grey; megabytes*2
 	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
@@ -60,4 +68,33 @@
 			</span>
 		</td>
 	</tr>
-<?php endforeach;
+<?php endforeach; ?>
+	<?php if ($totaldirs !== 0 || $totalfiles !== 0): ?>
+	<tr class="summary">
+		<td><span class="info">
+			<?php if ($totaldirs !== 0) {
+				p($totaldirs.' ');
+				if ($totaldirs === 1) {
+					p($l->t('directory'));
+				} else {
+					p($l->t('directories'));
+				}
+			}
+			if ($totaldirs !== 0 && $totalfiles !== 0) {
+				p(' & ');
+			}
+			if ($totalfiles !== 0) {
+				p($totalfiles.' ');
+				if ($totalfiles === 1) {
+					p($l->t('file'));
+				} else {
+					p($l->t('files'));
+				}
+			} ?>
+		</span></td>
+		<td class="filesize">
+		<?php print_unescaped(OCP\simple_file_size($totalsize)); ?>
+		</td>
+		<td></td>
+	</tr>
+	<?php endif;