diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 2fa3122a008..1f99d561a13 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -971,9 +971,9 @@ OC.Uploader.prototype = _.extend({
 					$('#uploadprogressbar').progressbar({value: 0});
 					$('#uploadprogressbar .ui-progressbar-value').
 						html('<em class="label inner"><span class="desktop">'
-							+ t('files', 'Uploading...')
+							+ t('files', 'Uploading …')
 							+ '</span><span class="mobile">'
-							+ t('files', '...')
+							+ t('files', '…')
 							+ '</span></em>');
 					$('#uploadprogressbar').tooltip({placement: 'bottom'});
 					self._showProgressBar();
@@ -1021,6 +1021,10 @@ OC.Uploader.prototype = _.extend({
 					}
 
 					var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
+					if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) {
+						// show "Uploading ..." for durations longer than 4 hours
+						h = t('files', 'Uploading …');
+					}
 					$('#uploadprogressbar .label .mobile').text(h);
 					$('#uploadprogressbar .label .desktop').text(h);
 					$('#uploadprogressbar').attr('original-title',
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index d66f12f4aff..b8b72a10100 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -2,7 +2,7 @@
 		<div class="actions creatable hidden">
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar">
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em>
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading @'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
 				</div>
 				<input type="button" class="stop icon-close" style="display:none" value="" />
 			</div>