diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
index 2d88f3caf..da7a9b9ed 100644
--- a/lib/l10n/intl_messages.arb
+++ b/lib/l10n/intl_messages.arb
@@ -1,133 +1,162 @@
 {
-  "@@last_modified": "2021-08-27T17:46:09.196916",
+  "@@last_modified": "2021-09-15T10:01:46.152493",
   "initializing_data": "Initializing data...",
   "@initializing_data": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "login_text_slogan": "TMail",
   "@login_text_slogan": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "prefix_https": "https://",
   "@prefix_https": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "username": "username",
   "@username": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "password": "password",
   "@password": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "login": "Login",
   "@login": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "login_text_login_to_continue": "Please login to continue",
   "@login_text_login_to_continue": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "unknown_error_login_message": "Unknown error occurred, please try again",
   "@unknown_error_login_message": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "search_folder": "Search folder",
   "@search_folder": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "storage": "STORAGE",
   "@storage": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "my_folders": "MY FOLDERS",
   "@my_folders": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "new_folder": "New folder",
   "@new_folder": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "reply_all": "Reply all",
   "@reply_all": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "reply": "Reply",
   "@reply": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "forward": "Forward",
   "@forward": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "no_emails": "No emails",
   "@no_emails": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "no_mail_selected": "No email selected",
   "@no_mail_selected": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "from_email_address_prefix": "From",
   "@from_email_address_prefix": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "to_email_address_prefix": "To",
   "@to_email_address_prefix": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "unread_email_notification": "new",
   "@unread_email_notification": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "bcc_email_address_prefix": "Bcc",
   "@bcc_email_address_prefix": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "cc_email_address_prefix": "Cc",
   "@cc_email_address_prefix": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "hint_text_email_address": "Name or email address",
   "@hint_text_email_address": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "subject_email": "Subject",
   "@subject_email": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "hint_content_email_composer": "Start writing your email here",
   "@hint_content_email_composer": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "header_email_quoted": "On {sentDate}, from {emailAddress}",
   "@header_email_quoted": {
     "type": "text",
+    "placeholders_order": [
+      "sentDate",
+      "emailAddress"
+    ],
     "placeholders": {
       "sentDate": {},
       "emailAddress": {}
@@ -136,11 +165,37 @@
   "prefix_reply_email": "Re:",
   "@prefix_reply_email": {
     "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   },
   "prefix_forward_email": "Fwd:",
   "@prefix_forward_email": {
     "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
+  },
+  "your_email_being_sent": "Your email being sent...",
+  "@your_email_being_sent": {
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
+  },
+  "your_email_should_have_at_least_one_recipient": "Your email should have at least one recipient",
+  "@your_email_should_have_at_least_one_recipient": {
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
+  },
+  "message_sent": "Message sent",
+  "@message_sent": {
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
+  },
+  "error_message_sent": "Error message sent",
+  "@error_message_sent": {
+    "type": "text",
+    "placeholders_order": [],
     "placeholders": {}
   }
 }
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 66e058825..398a5dc29 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,15 +20,6 @@ version: 1.0.0+1
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
-dependency_overrides:
-  # build_runner dependencies
-  intl: 0.17.0
-  args: 2.2.0
-  dart_style: 2.0.3
-  analyzer: 2.2.0
-  petitparser: 4.2.0
-  meta: 1.7.0
-
 dependencies:
   flutter:
     sdk: flutter
@@ -50,8 +41,7 @@ dependencies:
   get: 4.1.4
 
   # intl
-  intl: 0.17.0
-  intl_translation: 0.17.10+1
+  intl_generator: 0.2.0+0
 
   # flutter_svg
   flutter_svg: 0.22.0