diff --git a/i18n/en_us.json b/i18n/en_us.json
index 9a063af..af6db22 100644
--- a/i18n/en_us.json
+++ b/i18n/en_us.json
@@ -21,6 +21,7 @@
   "order_cta": "Order page",
   "order_title": "received your order!",
   "delivering_today": "will be delivered today",
+  "delivering_until_tomorrow": "will be delivered until tomorrow",
   "order_text": "",
   "my_acc": "my account page",
   "contact_us": "If you have any questions, please contact us.",
@@ -127,4 +128,4 @@
   "will_mail": "will be sent by email",
   "sent_mail": "sent by e-mail",
   "soon": "soon"
-}
\ No newline at end of file
+}
diff --git a/i18n/pt_br.json b/i18n/pt_br.json
index ed54439..9539530 100644
--- a/i18n/pt_br.json
+++ b/i18n/pt_br.json
@@ -30,6 +30,7 @@
   "pickup_for": "para retirada",
   "delivering_in": "será entregue em até",
   "delivering_today": "será entregue ainda hoje",
+  "delivering_until_tomorrow": "será entregue até amanhã",
   "working_days": "dias úteis",
   "working_day": "dia útil",
   "days": "dias",
diff --git a/views/authorized.ejs b/views/authorized.ejs
index 00c95d5..787ee7d 100644
--- a/views/authorized.ejs
+++ b/views/authorized.ejs
@@ -165,7 +165,7 @@ if (order.status_link) {
                                                     </font>
                                                   </div>
                                                 </td>
-                                                <% } else if (shipping.delivery_time.days == 0 ) { %>
+                                                <% } else if (shipping.delivery_time.days == 0) { %>
                                                   <td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
                                                     height="100%" valign="top" bgcolor="">
                                                     <div style="text-align: center;">
@@ -173,7 +173,7 @@ if (order.status_link) {
                                                         <%= i18n.order %>
                                                         <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                                        <strong><%= i18n.delivering_today %></strong>
+                                                        <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                                         <%= i18n.on_following_address %>
 
diff --git a/views/in_production.ejs b/views/in_production.ejs
index d068a44..8b452a4 100644
--- a/views/in_production.ejs
+++ b/views/in_production.ejs
@@ -145,7 +145,7 @@ if (order.status_link) {
                                                     </div>
                                                   </td>
 
-                                                  <% } else if (shipping.delivery_time.days == 0 ) { %>
+                                                  <% } else if (shipping.delivery_time.days == 0) { %>
                                                     <td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
                                                       height="100%" valign="top" bgcolor="">
                                                       <div style="text-align: center;">
@@ -153,7 +153,7 @@ if (order.status_link) {
                                                           <%= i18n.order %>
                                                           <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                                          <strong><%= i18n.delivering_today %></strong>
+                                                          <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                                           <%= i18n.on_following_address %>
 
diff --git a/views/new_order.ejs b/views/new_order.ejs
index b95a52a..c673582 100644
--- a/views/new_order.ejs
+++ b/views/new_order.ejs
@@ -511,7 +511,7 @@
                                                                   <% } %>
                                                                 </strong>
                                                                 <%= i18n.after_payment %>
-                                                                <% } else if (shipping.delivery_time.days == 0 ) { %>
+                                                                <% } else if (shipping.delivery_time.days == 0) { %>
                                                                   <td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
                                                                     height="100%" valign="top" bgcolor="">
                                                                     <div style="text-align: center;">
@@ -519,7 +519,7 @@
                                                                         <%= i18n.order %>
                                                                         <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                                                        <strong><%= i18n.delivering_today %></strong>
+                                                                        <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                                                         <%= i18n.on_following_address %>
 
diff --git a/views/paid.ejs b/views/paid.ejs
index 4c96515..2513b2b 100644
--- a/views/paid.ejs
+++ b/views/paid.ejs
@@ -151,7 +151,7 @@
                                               <%= i18n.order %>
                                               <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                              <strong><%= i18n.delivering_today %></strong>
+                                              <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                               <%= i18n.on_following_address %>
 
diff --git a/views/pending.ejs b/views/pending.ejs
index 91eddc0..01cb9c2 100644
--- a/views/pending.ejs
+++ b/views/pending.ejs
@@ -141,7 +141,7 @@
                                                       </font>
                                                     </div>
                                                   </td>
-                                                  <% } else if (shipping.delivery_time.days == 0 ) { %>
+                                                  <% } else if (shipping.delivery_time.days == 0) { %>
                                                     <td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
                                                       height="100%" valign="top" bgcolor="">
                                                       <div style="text-align: center;">
@@ -149,7 +149,7 @@
                                                           <%= i18n.order %>
                                                           <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                                          <strong><%= i18n.delivering_today %></strong>
+                                                          <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                                           <%= i18n.on_following_address %>
 
diff --git a/views/ready_for_shipping.ejs b/views/ready_for_shipping.ejs
index a11cae2..fe84437 100644
--- a/views/ready_for_shipping.ejs
+++ b/views/ready_for_shipping.ejs
@@ -124,7 +124,7 @@
                                                         <%= i18n.will_mail %> <%= i18n.soon %>
                                                     </div>
                                                   </td>
-                                                  <% } else if (shipping.delivery_time.days == 0 ) { %>
+                                                  <% } else if (shipping.delivery_time.days == 0) { %>
                                                     <td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
                                                       height="100%" valign="top" bgcolor="">
                                                       <div style="text-align: center;">
@@ -132,7 +132,7 @@
                                                           <%= i18n.order %>
                                                           <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                                          <strong><%= i18n.delivering_today %></strong>
+                                                          <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                                           <%= i18n.on_following_address %>
 
diff --git a/views/under_analysis.ejs b/views/under_analysis.ejs
index 5bb3f87..9a8d73c 100644
--- a/views/under_analysis.ejs
+++ b/views/under_analysis.ejs
@@ -143,7 +143,7 @@
                                                   </font>
                                                 </div>
                                               </td>
-                                              <% } else if (shipping.delivery_time.days == 0 ) { %>
+                                              <% } else if (shipping.delivery_time.days == 0) { %>
                                                 <td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
                                                   height="100%" valign="top" bgcolor="">
                                                   <div style="text-align: center;">
@@ -151,7 +151,7 @@
                                                       <%= i18n.order %>
                                                       <a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
 
-                                                      <strong><%= i18n.delivering_today %></strong>
+                                                      <strong><%= i18n.delivering_until_tomorrow %></strong>
 
                                                       <%= i18n.on_following_address %>