diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 3946b216dd1af6cfe7da05e292a915164e5c0ffa..3bae97f046ada93cb7c701dfb5d52ffa58e7ad8f 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -71,11 +71,11 @@ class quota_lib {
 						$sites[$i]['hard'] .= ' KB';
 					}
 			
-					if($sites[$i]['soft'] == " KB") $sites[$i]['soft'] = $app->lng('unlimited');
-					if($sites[$i]['hard'] == " KB") $sites[$i]['hard'] = $app->lng('unlimited');
+					if($sites[$i]['soft'] == " KB") $sites[$i]['soft'] = $app->lng('unlimited_txt');
+					if($sites[$i]['hard'] == " KB") $sites[$i]['hard'] = $app->lng('unlimited_txt');
 					
-					if($sites[$i]['soft'] == '0 B' || $sites[$i]['soft'] == '0 KB' || $sites[$i]['soft'] == '0') $sites[$i]['soft'] = $app->lng('unlimited');
-					if($sites[$i]['hard'] == '0 B' || $sites[$i]['hard'] == '0 KB' || $sites[$i]['hard'] == '0') $sites[$i]['hard'] = $app->lng('unlimited');
+					if($sites[$i]['soft'] == '0 B' || $sites[$i]['soft'] == '0 KB' || $sites[$i]['soft'] == '0') $sites[$i]['soft'] = $app->lng('unlimited_txt');
+					if($sites[$i]['hard'] == '0 B' || $sites[$i]['hard'] == '0 KB' || $sites[$i]['hard'] == '0') $sites[$i]['hard'] = $app->lng('unlimited_txt');
 					
 					/*
 					 if(!strstr($sites[$i]['used'],'M') && !strstr($sites[$i]['used'],'K')) $sites[$i]['used'].= ' B';
@@ -266,7 +266,7 @@ class quota_lib {
 					if($used_ratio >= 1) $emails[$i]['display_colour'] = '#cc0000';
 			
 					if($emails[$i]['quota'] == 0){
-						$emails[$i]['quota'] = $app->lng('unlimited');
+						$emails[$i]['quota'] = $app->lng('unlimited_txt');
 					} else {
                                                $emails[$i]['quota'] = round($emails[$i]['quota'] / 1048576, 1).' MB';
 					}
@@ -327,7 +327,7 @@ class quota_lib {
 					if($used_ratio >= 1) $databases[$i]['display_colour'] = '#cc0000';
 						
 					if($databases[$i]['database_quota'] == 0){
-						$databases[$i]['database_quota'] = $app->lng('unlimited');
+						$databases[$i]['database_quota'] = $app->lng('unlimited_txt');
 					} else {
 						$databases[$i]['database_quota'] = $databases[$i]['database_quota'] . ' MB';
 					}
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index 90a92558fa03871336c6396fe2dee241ab1e724b..9699acafda6f5e8f90292b403bd4f860967b2864 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -52,7 +52,7 @@ class list_action extends listform_actions {
 		if (!is_numeric($rec['used'])) $rec['used']=$rec['used'][1];
 
 		if($rec['quota'] == 0){
-			$rec['quota'] = $app->lng('unlimited');
+			$rec['quota'] = $app->lng('unlimited_txt');
 			$rec['percentage'] = '';
 			$rec['percentage_sort'] = 0;
 		} else {
diff --git a/interface/web/sites/database_quota_stats.php b/interface/web/sites/database_quota_stats.php
index 5f550cf8d141a352945e86bda2eca4ff31f6854a..4e960bce27e9323267ea673948929864efd1faf8 100644
--- a/interface/web/sites/database_quota_stats.php
+++ b/interface/web/sites/database_quota_stats.php
@@ -72,7 +72,7 @@ class list_action extends listform_actions {
 			$rec['quota'] = $monitor_data[$rec['server_id'].'.'.$database_name]['quota'];
 
 			if($rec['quota'] == 0){
-				$rec['quota'] = $app->lng('unlimited');
+				$rec['quota'] = $app->lng('unlimited_txt');
 				$rec['percentage'] = '';
 			} else {
 				if ($rec['used'] > 0 ) $rec['percentage'] = round(100 * intval($rec['used']) / ( intval($rec['quota'])*1024*1024) ).'%';
diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php
index 9c9300807647fa9b499279a0900ac2d43fab3feb..8c641eede9726d7f9f0818c840872bb018887263 100644
--- a/interface/web/sites/user_quota_stats.php
+++ b/interface/web/sites/user_quota_stats.php
@@ -63,8 +63,8 @@ class list_action extends listform_actions {
 		$rec['used']=$app->functions->formatBytes($rec['used']*1024);
 		$rec['soft']=$app->functions->formatBytes($rec['soft']*1024);
 		$rec['hard']=$app->functions->formatBytes($rec['hard']*1024);
-		if($rec['soft'] == "NAN") $rec['soft'] = $app->lng('unlimited');
-		if($rec['hard'] == "NAN") $rec['hard'] = $app->lng('unlimited');
+		if($rec['soft'] == "NAN") $rec['soft'] = $app->lng('unlimited_txt');
+		if($rec['hard'] == "NAN") $rec['hard'] = $app->lng('unlimited_txt');
 /*
 		if($rec['used'] > 1024) {
 			$rec['used'] = round($rec['used'] / 1024, 2).' MB';
@@ -84,8 +84,8 @@ class list_action extends listform_actions {
 			$rec['hard'] .= ' KB';
 		}
 
-		if($rec['soft'] == " KB") $rec['soft'] = $app->lng('unlimited');
-		if($rec['hard'] == " KB") $rec['hard'] = $app->lng('unlimited');
+		if($rec['soft'] == " KB") $rec['soft'] = $app->lng('unlimited_txt');
+		if($rec['hard'] == " KB") $rec['hard'] = $app->lng('unlimited_txt');
 */
 
 		/*
@@ -94,8 +94,8 @@ class list_action extends listform_actions {
 		if(!strstr($rec['hard'],'M') && !strstr($rec['hard'],'K')) $rec['hard'].= ' B';
 		*/
 /*
-		if($rec['soft'] == '0 B' || $rec['soft'] == '0 KB' || $rec['soft'] == '0') $rec['soft'] = $app->lng('unlimited');
-		if($rec['hard'] == '0 B' || $rec['hard'] == '0 KB' || $rec['hard'] == '0') $rec['hard'] = $app->lng('unlimited');
+		if($rec['soft'] == '0 B' || $rec['soft'] == '0 KB' || $rec['soft'] == '0') $rec['soft'] = $app->lng('unlimited_txt');
+		if($rec['hard'] == '0 B' || $rec['hard'] == '0 KB' || $rec['hard'] == '0') $rec['hard'] = $app->lng('unlimited_txt');
 */
 		//* The variable "id" contains always the index variable
 		$rec['id'] = $rec[$this->idx_key];