diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 258b9238c..692f82000 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -72,14 +72,15 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
 		const currentPage = koCurrentPage(),
 			pageCount = koPageCount(),
 			result = [],
+			lang = doc.documentElement.lang,
 			fAdd = (index, push = true, customName = '') => {
-				const data = {
-					current: index === currentPage,
-					name: customName ? customName.toString() : index.toString(),
-					custom: !!customName,
-					title: customName ? index.toString() : '',
-					value: index.toString()
-				};
+				const name = index.toLocaleString(lang),
+					data = {
+						current: index === currentPage,
+						name: customName || name,
+						title: customName ? name : '',
+						value: index
+					};
 
 				push ? result.push(data) : result.unshift(data);
 			};
diff --git a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
index b7ebf668b..6295e4fd0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Common/Paginator.html
@@ -1,3 +1,3 @@
 <nav class="e-paginator g-ui-user-select-none" data-bind="foreach: $data">
-	<a data-bind="css: { 'current': current, 'custom': custom }, title: title, text: name"></a>
+	<a data-bind="css: { 'current': current }, title: title, text: name"></a>
 </nav>