-            
+        
+            
                 
                 
-                    
-                        Your ThingsBoard account feature was disabled
+                     |   | 
+                 
+                
+                    | Your ThingsBoard account feature was disabled | 
+                 
+                
+                    
+                         
+                             We have disabled the ${apiFeature} for your account because ThingsBoard has already ${apiLimitValueLabel}. 
+                          
                      | 
                  
                 
-                    | We have disabled the ${apiFeature} for your account because ThingsBoard has already ${apiLimitValueLabel}.
-                     | 
+                    Please contact your system administrator to resolve the issue. | 
                  
                 
-                    | Please contact your system administrator to resolve the issue.
-                     | 
-                 
-                
-                    | — The ThingsBoard
-                     | 
+                    — The ThingsBoard | 
                  
                 
              
@@ -144,16 +134,10 @@
     
     
  |  
-
+
diff --git a/application/src/main/resources/templates/state.enabled.ftl b/application/src/main/resources/templates/state.enabled.ftl
index 0a7841f871..d57bff5a7e 100644
--- a/application/src/main/resources/templates/state.enabled.ftl
+++ b/application/src/main/resources/templates/state.enabled.ftl
@@ -103,34 +103,27 @@
 	  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"
 	  bgcolor="#f6f6f6">
 
-
+
 	
 	
-		
-			
+		
+			
 				
 				
-					
-						Your ThingsBoard account feature was enabled
+					 |   | 
+				 
+				
+					| Your ThingsBoard account feature was enabled | 
+				 
+				
+					
+						 
+							 We have enabled the ${apiFeature} for your account and ThingsBoard is already able to ${apiLabel} messages. 
+						  
 					 | 
 				 
 				
-					| We have enabled the ${apiFeature} for your account and ThingsBoard is already able to ${apiLabel} messages.
-					 | 
-				 
-				
-					| — The ThingsBoard
-					 | 
+					— The ThingsBoard | 
 				 
 				
 			 
@@ -138,16 +131,10 @@
 	
 	
  |  
-
+
diff --git a/application/src/main/resources/templates/state.warning.ftl b/application/src/main/resources/templates/state.warning.ftl
index 1ce29100a7..ffd300d614 100644
--- a/application/src/main/resources/templates/state.warning.ftl
+++ b/application/src/main/resources/templates/state.warning.ftl
@@ -103,41 +103,30 @@
 	  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #f6f6f6; margin: 0;"
 	  bgcolor="#f6f6f6">
 
-
+
 	
 	
-		
-			
+		
+			
 				
 				
-					
-						Your ThingsBoard account feature may be disabled soon
+					 |   | 
+				 
+				
+					| Warning: your ThingsBoard account feature may be disabled soon | 
+				 
+				
+					
+						 
+							 ThingsBoard has already ${apiValueLabel}. ${apiFeature} will be disabled for your account once the limit will be reached. 
+						  
 					 | 
 				 
 				
-					
-						ThingsBoard has already ${apiValueLabel}.  ${apiFeature} will be disabled for your account once the limit will be reached.
-					 | 
+					Please contact your system administrator to resolve the issue. | 
 				 
 				
-					| Please contact your system administrator to resolve the issue.
-					 | 
-				 
-				
-					| — The ThingsBoard
-					 | 
+					— The ThingsBoard | 
 				 
 				
 			 
@@ -145,16 +134,10 @@
 	
 	
  |  
- |      |      |