diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 4fd3da1a5..e2f948818 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -518,7 +518,7 @@ export function changeTheme(value, themeTrigger = ()=>{}) {
 /**
  * @returns {function}
  */
-export function computedPagenatorHelper(koCurrentPage, koPageCount) {
+export function computedPaginatorHelper(koCurrentPage, koPageCount) {
 	return () => {
 		const currentPage = koCurrentPage(),
 			pageCount = koPageCount(),
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index 1aeb110d9..e06e83fc4 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -84,7 +84,7 @@
 	}
 }
 
-.e-pagenator {
+.e-paginator {
 
 	.e-page {
 
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index 2e549aac2..f0244f4aa 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -12,7 +12,7 @@ import {
 
 import {
 	delegateRunOnDestroy,
-	computedPagenatorHelper,
+	computedPaginatorHelper,
 	pInt
 } from 'Common/Utils';
 
@@ -70,7 +70,7 @@ class ContactsPopupView extends AbstractViewNext {
 			return 0 >= iPage ? 1 : iPage;
 		});
 
-		this.contactsPagenator = ko.computed(computedPagenatorHelper(this.contactsPage, this.contactsPageCount));
+		this.contactsPaginator = ko.computed(computedPaginatorHelper(this.contactsPage, this.contactsPageCount));
 
 		this.emptySelection = ko.observable(true);
 		this.viewClearSearch = ko.observable(false);
@@ -615,7 +615,7 @@ class ContactsPopupView extends AbstractViewNext {
 		const self = this;
 
 		dom.addEventListener('click', event => {
-			let el = event.target.closestWithin('.e-pagenator .e-page', dom);
+			let el = event.target.closestWithin('.e-paginator .e-page', dom);
 			if (el && ko.dataFor(el)) {
 				self.contactsPage(pInt(ko.dataFor(el).value));
 				self.reloadContactList();
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 01ecbac1f..f5021ba85 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -15,7 +15,7 @@ import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 
 import { leftPanelDisabled, moveAction } from 'Common/Globals';
 
-import { computedPagenatorHelper } from 'Common/Utils';
+import { computedPaginatorHelper } from 'Common/Utils';
 import { File } from 'Common/File';
 
 import { mailBox, append } from 'Common/Links';
@@ -128,8 +128,8 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 			return value ? i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', { 'SEARCH': value }) : '';
 		});
 
-		this.messageListPagenator = ko.computed(
-			computedPagenatorHelper(MessageStore.messageListPage, MessageStore.messageListPageCount)
+		this.messageListPaginator = ko.computed(
+			computedPaginatorHelper(MessageStore.messageListPage, MessageStore.messageListPageCount)
 		);
 
 		this.checkAll = ko.computed({
@@ -375,7 +375,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 		this.iGoToUpUpOrDownDownTimeout = setTimeout(() => {
 			let prev, next, temp, current;
 
-			this.messageListPagenator().find(item => {
+			this.messageListPaginator().find(item => {
 				if (item) {
 					if (current) {
 						next = item;
@@ -702,7 +702,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
 				AppStore.focusedState(Focused.MessageList);
 			}
 
-			let el = eqs(event, '.e-pagenator .e-page');
+			let el = eqs(event, '.e-paginator .e-page');
 			el && this.gotoPage(ko.dataFor(el));
 
 			eqs(event, '.messageList .checkboxCkeckAll') && this.checkAll(!this.checkAll());
diff --git a/rainloop/v/0.0.0/app/templates/Views/Common/Pagenator.html b/rainloop/v/0.0.0/app/templates/Views/Common/Pagenator.html
index 7609a9793..5c98d9bce 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Common/Pagenator.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Common/Pagenator.html
@@ -1,5 +1,5 @@
-<div class="e-pagenator g-ui-user-select-none" data-bind="foreach: $data">
+<div class="e-paginator g-ui-user-select-none" data-bind="foreach: $data">
 	<a class="e-page" data-bind="css: { 'current': current, 'custom': custom }, title: title">
 		<span class="e-page-number" data-bind="text: name"></span>
 	</a>
-</div>
\ No newline at end of file
+</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
index a090045b6..69dc25982 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -202,7 +202,7 @@
 					<span data-bind="text: userUsageProc"></span>%
 				</span>
 				<div class="pull-right">
-					<!-- ko template: { name: 'Pagenator', data: messageListPagenator } --><!-- /ko -->
+					<!-- ko template: { name: 'Paginator', data: messageListPaginator } --><!-- /ko -->
 				</div>
 			</div>
 		</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index 91af31019..c735498f9 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -104,7 +104,7 @@
 		</div>
 		<div class="b-list-footer-toolbar">
 			<div class="pull-right footer-pager">
-				<!-- ko template: { name: 'Pagenator', data: contactsPagenator } --><!-- /ko -->
+				<!-- ko template: { name: 'Paginator', data: contactsPaginator } --><!-- /ko -->
 			</div>
 		</div>
 		<div class="b-view-content-toolbar btn-toolbar" data-bind="css: {'read-only': viewReadOnly}">