Merge pull request #6474 from thundernest/respect-font-size-settings

Message view redesign: Respect font size settings

app/core/src/main/java/com/fsck/k9/FontSizes.java

@@ -21,10 +21,7 @@ public class FontSizes {
     private static final String MESSAGE_LIST_DATE = "fontSizeMessageListDate";
     private static final String MESSAGE_LIST_PREVIEW = "fontSizeMessageListPreview";
     private static final String MESSAGE_VIEW_SENDER = "fontSizeMessageViewSender";
-    private static final String MESSAGE_VIEW_TO = "fontSizeMessageViewTo";
+    private static final String MESSAGE_VIEW_RECIPIENTS = "fontSizeMessageViewTo";
-    private static final String MESSAGE_VIEW_CC = "fontSizeMessageViewCC";
-    private static final String MESSAGE_VIEW_BCC = "fontSizeMessageViewBCC";
-    private static final String MESSAGE_VIEW_ADDITIONAL_HEADERS = "fontSizeMessageViewAdditionalHeaders";
     private static final String MESSAGE_VIEW_SUBJECT = "fontSizeMessageViewSubject";
     private static final String MESSAGE_VIEW_DATE = "fontSizeMessageViewDate";
     private static final String MESSAGE_VIEW_CONTENT_PERCENT = "fontSizeMessageViewContentPercent";
@@ -50,10 +47,7 @@ public class FontSizes {
     private int messageListDate;
     private int messageListPreview;
     private int messageViewSender;
-    private int messageViewTo;
+    private int messageViewRecipients;
-    private int messageViewCC;
-    private int messageViewBCC;
-    private int messageViewAdditionalHeaders;
     private int messageViewSubject;
     private int messageViewDate;
     private int messageViewContentPercent;
@@ -73,10 +67,7 @@ public class FontSizes {
         messageListPreview = FONT_DEFAULT;
 
         messageViewSender = FONT_DEFAULT;
-        messageViewTo = FONT_DEFAULT;
+        messageViewRecipients = FONT_DEFAULT;
-        messageViewCC = FONT_DEFAULT;
-        messageViewBCC = FONT_DEFAULT;
-        messageViewAdditionalHeaders = FONT_DEFAULT;
         messageViewSubject = FONT_DEFAULT;
         messageViewDate = FONT_DEFAULT;
         messageViewContentPercent = 100;
@@ -97,10 +88,7 @@ public class FontSizes {
         editor.putInt(MESSAGE_LIST_PREVIEW, messageListPreview);
 
         editor.putInt(MESSAGE_VIEW_SENDER, messageViewSender);
-        editor.putInt(MESSAGE_VIEW_TO, messageViewTo);
+        editor.putInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients);
-        editor.putInt(MESSAGE_VIEW_CC, messageViewCC);
-        editor.putInt(MESSAGE_VIEW_BCC, messageViewBCC);
-        editor.putInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders);
         editor.putInt(MESSAGE_VIEW_SUBJECT, messageViewSubject);
         editor.putInt(MESSAGE_VIEW_DATE, messageViewDate);
         editor.putInt(MESSAGE_VIEW_CONTENT_PERCENT, getMessageViewContentAsPercent());
@@ -121,10 +109,7 @@ public class FontSizes {
         messageListPreview = storage.getInt(MESSAGE_LIST_PREVIEW, messageListPreview);
 
         messageViewSender = storage.getInt(MESSAGE_VIEW_SENDER, messageViewSender);
-        messageViewTo = storage.getInt(MESSAGE_VIEW_TO, messageViewTo);
+        messageViewRecipients = storage.getInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients);
-        messageViewCC = storage.getInt(MESSAGE_VIEW_CC, messageViewCC);
-        messageViewBCC = storage.getInt(MESSAGE_VIEW_BCC, messageViewBCC);
-        messageViewAdditionalHeaders = storage.getInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders);
         messageViewSubject = storage.getInt(MESSAGE_VIEW_SUBJECT, messageViewSubject);
         messageViewDate = storage.getInt(MESSAGE_VIEW_DATE, messageViewDate);
 
@@ -209,36 +194,12 @@ public class FontSizes {
         this.messageViewSender = messageViewSender;
     }
 
-    public int getMessageViewTo() {
+    public int getMessageViewRecipients() {
-        return messageViewTo;
+        return messageViewRecipients;
     }
 
-    public void setMessageViewTo(int messageViewTo) {
+    public void setMessageViewRecipients(int messageViewRecipients) {
-        this.messageViewTo = messageViewTo;
+        this.messageViewRecipients = messageViewRecipients;
-    }
-
-    public int getMessageViewCC() {
-        return messageViewCC;
-    }
-
-    public void setMessageViewCC(int messageViewCC) {
-        this.messageViewCC = messageViewCC;
-    }
-
-    public int getMessageViewBCC() {
-        return messageViewBCC;
-    }
-
-    public void setMessageViewBCC(int messageViewBCC) {
-        this.messageViewBCC = messageViewBCC;
-    }
-
-    public int getMessageViewAdditionalHeaders() {
-        return messageViewAdditionalHeaders;
-    }
-
-    public void setMessageViewAdditionalHeaders(int messageViewAdditionalHeaders) {
-        this.messageViewAdditionalHeaders = messageViewAdditionalHeaders;
     }
 
     public int getMessageViewSubject() {

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt

@@ -26,10 +26,7 @@ data class MessageListActivityConfig(
     val fontSizeMessageListDate: Int,
     val fontSizeMessageListPreview: Int,
     val fontSizeMessageViewSender: Int,
-    val fontSizeMessageViewTo: Int,
+    val fontSizeMessageViewRecipients: Int,
-    val fontSizeMessageViewCC: Int,
-    val fontSizeMessageViewBCC: Int,
-    val fontSizeMessageViewAdditionalHeaders: Int,
     val fontSizeMessageViewSubject: Int,
     val fontSizeMessageViewDate: Int,
     val fontSizeMessageViewContentAsPercent: Int,
@@ -60,10 +57,7 @@ data class MessageListActivityConfig(
                 fontSizeMessageListDate = K9.fontSizes.messageListDate,
                 fontSizeMessageListPreview = K9.fontSizes.messageListPreview,
                 fontSizeMessageViewSender = K9.fontSizes.messageViewSender,
-                fontSizeMessageViewTo = K9.fontSizes.messageViewTo,
+                fontSizeMessageViewRecipients = K9.fontSizes.messageViewRecipients,
-                fontSizeMessageViewCC = K9.fontSizes.messageViewCC,
-                fontSizeMessageViewBCC = K9.fontSizes.messageViewBCC,
-                fontSizeMessageViewAdditionalHeaders = K9.fontSizes.messageViewAdditionalHeaders,
                 fontSizeMessageViewSubject = K9.fontSizes.messageViewSubject,
                 fontSizeMessageViewDate = K9.fontSizes.messageViewDate,
                 fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent,

app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

@@ -119,12 +119,9 @@ class GeneralSettingsDataStore(
             "message_list_date_font" -> K9.fontSizes.messageListDate.toString()
             "message_list_preview_font" -> K9.fontSizes.messageListPreview.toString()
             "message_view_sender_font" -> K9.fontSizes.messageViewSender.toString()
-            "message_view_to_font" -> K9.fontSizes.messageViewTo.toString()
+            "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients.toString()
-            "message_view_cc_font" -> K9.fontSizes.messageViewCC.toString()
-            "message_view_bcc_font" -> K9.fontSizes.messageViewBCC.toString()
             "message_view_subject_font" -> K9.fontSizes.messageViewSubject.toString()
             "message_view_date_font" -> K9.fontSizes.messageViewDate.toString()
-            "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders.toString()
             "message_compose_input_font" -> K9.fontSizes.messageComposeInput.toString()
             "swipe_action_right" -> swipeActionToString(K9.swipeRightAction)
             "swipe_action_left" -> swipeActionToString(K9.swipeLeftAction)
@@ -160,12 +157,9 @@ class GeneralSettingsDataStore(
             "message_list_date_font" -> K9.fontSizes.messageListDate = value.toInt()
             "message_list_preview_font" -> K9.fontSizes.messageListPreview = value.toInt()
             "message_view_sender_font" -> K9.fontSizes.messageViewSender = value.toInt()
-            "message_view_to_font" -> K9.fontSizes.messageViewTo = value.toInt()
+            "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients = value.toInt()
-            "message_view_cc_font" -> K9.fontSizes.messageViewCC = value.toInt()
-            "message_view_bcc_font" -> K9.fontSizes.messageViewBCC = value.toInt()
             "message_view_subject_font" -> K9.fontSizes.messageViewSubject = value.toInt()
             "message_view_date_font" -> K9.fontSizes.messageViewDate = value.toInt()
-            "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders = value.toInt()
             "message_compose_input_font" -> K9.fontSizes.messageComposeInput = value.toInt()
             "swipe_action_right" -> K9.swipeRightAction = stringToSwipeAction(value)
             "swipe_action_left" -> K9.swipeLeftAction = stringToSwipeAction(value)

app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java

@@ -17,6 +17,7 @@ import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.PopupMenu.OnMenuItemClickListener;
 import com.fsck.k9.Account;
 import com.fsck.k9.DI;
+import com.fsck.k9.FontSizes;
 import com.fsck.k9.K9;
 import com.fsck.k9.activity.misc.ContactPicture;
 import com.fsck.k9.contacts.ContactPictureLoader;
@@ -34,12 +35,16 @@ import com.google.android.material.snackbar.Snackbar;
 public class MessageHeader extends LinearLayout implements OnClickListener, OnLongClickListener {
     private static final int DEFAULT_SUBJECT_LINES = 3;
 
+    private final FontSizes fontSizes = K9.getFontSizes();
+
     private Chip accountChip;
     private TextView subjectView;
     private ImageView starView;
     private ImageView contactPictureView;
     private TextView fromView;
     private ImageView cryptoStatusIcon;
+    private TextView toView;
+    private TextView toCountView;
     private TextView dateView;
 
     private MessageHelper messageHelper;
@@ -67,8 +72,16 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo
         contactPictureView = findViewById(R.id.contact_picture);
         fromView = findViewById(R.id.from);
         cryptoStatusIcon = findViewById(R.id.crypto_status_icon);
+        toView = findViewById(R.id.to);
+        toCountView = findViewById(R.id.to_count);
         dateView = findViewById(R.id.date);
 
+        fontSizes.setViewTextSize(subjectView, fontSizes.getMessageViewSubject());
+        fontSizes.setViewTextSize(dateView, fontSizes.getMessageViewDate());
+        fontSizes.setViewTextSize(fromView, fontSizes.getMessageViewSender());
+        fontSizes.setViewTextSize(toView, fontSizes.getMessageViewRecipients());
+        fontSizes.setViewTextSize(toCountView, fontSizes.getMessageViewRecipients());
+
         subjectView.setOnClickListener(this);
         subjectView.setOnLongClickListener(this);
 

app/ui/legacy/src/main/res/values-ar/strings.xml

@@ -605,9 +605,6 @@
   <string name="font_size_message_list_preview">معاينة</string>
   <string name="font_size_message_view">رسائل</string>
   <string name="font_size_message_view_sender">مُرسِل</string>
-  <string name="font_size_message_view_to">إلى</string>
-  <string name="font_size_message_view_cc">نسخة</string>
-  <string name="font_size_message_view_additional_headers">ترويسات إضافية</string>
   <string name="font_size_message_view_subject">العنوان</string>
   <string name="font_size_message_view_date">الوقت والتاريخ</string>
   <string name="font_size_message_view_content">نصّ الرسالة</string>

app/ui/legacy/src/main/res/values-be/strings.xml

@@ -668,10 +668,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
   <string name="font_size_message_list_preview">Папярэдні прагляд</string>
   <string name="font_size_message_view">Паведамленне</string>
   <string name="font_size_message_view_sender">Адпраўнік</string>
-  <string name="font_size_message_view_to">Каму</string>
-  <string name="font_size_message_view_cc">Копія</string>
-  <string name="font_size_message_view_bcc">Схаваная копія</string>
-  <string name="font_size_message_view_additional_headers">Дадатковыя загалоўкі</string>
   <string name="font_size_message_view_subject">Тэма</string>
   <string name="font_size_message_view_date">Час і дата</string>
   <string name="font_size_message_view_content">Цела ліста</string>

app/ui/legacy/src/main/res/values-bg/strings.xml

@@ -665,10 +665,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
   <string name="font_size_message_list_preview">Преглед</string>
   <string name="font_size_message_view">Съобщения</string>
   <string name="font_size_message_view_sender">Изпращач</string>
-  <string name="font_size_message_view_to">До</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Допълнителни header-и</string>
   <string name="font_size_message_view_subject">Тема</string>
   <string name="font_size_message_view_date">Дата и час</string>
   <string name="font_size_message_view_content">Тяло на съобщението</string>

app/ui/legacy/src/main/res/values-br/strings.xml

@@ -636,10 +636,6 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa
   <string name="font_size_message_list_preview">Alberz</string>
   <string name="font_size_message_view">Kemennadennoù</string>
   <string name="font_size_message_view_sender">Kaser</string>
-  <string name="font_size_message_view_to">Da</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Talbennoù ouzhpenn</string>
   <string name="font_size_message_view_subject">Danvez</string>
   <string name="font_size_message_view_date">Eur ha deiziad</string>
   <string name="font_size_message_view_content">Korf ar gemennadenn</string>

app/ui/legacy/src/main/res/values-ca/strings.xml

@@ -730,10 +730,6 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p
   <string name="font_size_message_list_preview">Vista prèvia</string>
   <string name="font_size_message_view">Missatges</string>
   <string name="font_size_message_view_sender">Remitent</string>
-  <string name="font_size_message_view_to">A</string>
-  <string name="font_size_message_view_cc">A/c</string>
-  <string name="font_size_message_view_bcc">C/o</string>
-  <string name="font_size_message_view_additional_headers">Capçaleres addicionals</string>
   <string name="font_size_message_view_subject">Assumpte</string>
   <string name="font_size_message_view_date">Data i hora</string>
   <string name="font_size_message_view_content">Cos del missatge</string>

app/ui/legacy/src/main/res/values-cs/strings.xml

@@ -727,10 +727,6 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="font_size_message_list_preview">Náhled</string>
   <string name="font_size_message_view">Zpráva</string>
   <string name="font_size_message_view_sender">Odesílatel</string>
-  <string name="font_size_message_view_to">Příjemce (Komu)</string>
-  <string name="font_size_message_view_cc">Příjemce (Kopie)</string>
-  <string name="font_size_message_view_bcc">Skrytá kopie</string>
-  <string name="font_size_message_view_additional_headers">Další záhlaví</string>
   <string name="font_size_message_view_subject">Předmět</string>
   <string name="font_size_message_view_date">Datum a čas</string>
   <string name="font_size_message_view_content">Tělo</string>

app/ui/legacy/src/main/res/values-cy/strings.xml

@@ -729,10 +729,6 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti
   <string name="font_size_message_list_preview">Rhagolwg</string>
   <string name="font_size_message_view">Negeseuon</string>
   <string name="font_size_message_view_sender">Anfonwr</string>
-  <string name="font_size_message_view_to">At</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Penynnau ychwanegol</string>
   <string name="font_size_message_view_subject">Pwnc</string>
   <string name="font_size_message_view_date">Amser a dyddiad</string>
   <string name="font_size_message_view_content">Corff neges</string>

app/ui/legacy/src/main/res/values-da/strings.xml

@@ -694,10 +694,6 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="font_size_message_list_preview">Forhåndsvisning</string>
   <string name="font_size_message_view">Meddelelse</string>
   <string name="font_size_message_view_sender">Afsender</string>
-  <string name="font_size_message_view_to">Modtagere (Til)</string>
-  <string name="font_size_message_view_cc">Modtagere (Cc)</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Yderligere headere</string>
   <string name="font_size_message_view_subject">Emne</string>
   <string name="font_size_message_view_date">Tid og dato</string>
   <string name="font_size_message_view_content">Indhold</string>

app/ui/legacy/src/main/res/values-de/strings.xml

@@ -730,10 +730,6 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
   <string name="font_size_message_list_preview">Vorschau</string>
   <string name="font_size_message_view">Nachrichtenanzeige</string>
   <string name="font_size_message_view_sender">Absender</string>
-  <string name="font_size_message_view_to">Empfänger (To)</string>
-  <string name="font_size_message_view_cc">Empfänger (CC)</string>
-  <string name="font_size_message_view_bcc">Blindkopie (BCC)</string>
-  <string name="font_size_message_view_additional_headers">Zusätzliche Header</string>
   <string name="font_size_message_view_subject">Betreff</string>
   <string name="font_size_message_view_date">Uhrzeit und Datum</string>
   <string name="font_size_message_view_content">Nachrichtentext</string>

app/ui/legacy/src/main/res/values-el/strings.xml

@@ -725,10 +725,6 @@
   <string name="font_size_message_list_preview">Προεπισκόπηση</string>
   <string name="font_size_message_view">Μηνύματα</string>
   <string name="font_size_message_view_sender">Αποστολέας</string>
-  <string name="font_size_message_view_to">Προς</string>
-  <string name="font_size_message_view_cc">Κοινοποίηση</string>
-  <string name="font_size_message_view_bcc">Κρυφή Κοιν:</string>
-  <string name="font_size_message_view_additional_headers">Επιπλέον επικεφαλίδες</string>
   <string name="font_size_message_view_subject">Θέμα</string>
   <string name="font_size_message_view_date">Ώρα και Ημερομηνία</string>
   <string name="font_size_message_view_content">Σώμα μηνύματος</string>

app/ui/legacy/src/main/res/values-eo/strings.xml

@@ -683,10 +683,6 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="font_size_message_list_preview">Antaŭmontro</string>
   <string name="font_size_message_view">Mesaĝoj</string>
   <string name="font_size_message_view_sender">Sendinto</string>
-  <string name="font_size_message_view_to">Ricevonto</string>
-  <string name="font_size_message_view_cc">Ricevonto de kopio</string>
-  <string name="font_size_message_view_bcc">Kaŝkopio</string>
-  <string name="font_size_message_view_additional_headers">Aldonaj kapoj</string>
   <string name="font_size_message_view_subject">Temo</string>
   <string name="font_size_message_view_date">Tempo kaj dato</string>
   <string name="font_size_message_view_content">Mesaĝa enhavo</string>

app/ui/legacy/src/main/res/values-es/strings.xml

@@ -730,10 +730,6 @@ Puedes informar de fallos, contribuir con su desarrollo y hacer preguntas en <a
   <string name="font_size_message_list_preview">Previsualizar</string>
   <string name="font_size_message_view">Mensajes</string>
   <string name="font_size_message_view_sender">Remitente</string>
-  <string name="font_size_message_view_to">Para</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Cco</string>
-  <string name="font_size_message_view_additional_headers">Encabezados adicionales</string>
   <string name="font_size_message_view_subject">Asunto</string>
   <string name="font_size_message_view_date">Hora y fecha</string>
   <string name="font_size_message_view_content">Cuerpo de mensaje</string>

app/ui/legacy/src/main/res/values-et/strings.xml

@@ -726,10 +726,6 @@ Veateated saad saata, kaastööd teha ning küsida teavet järgmisel lehel:
   <string name="font_size_message_list_preview">Eelvaade</string>
   <string name="font_size_message_view">Kirjad</string>
   <string name="font_size_message_view_sender">Saatja</string>
-  <string name="font_size_message_view_to">Kellele</string>
-  <string name="font_size_message_view_cc">Koopia</string>
-  <string name="font_size_message_view_bcc">Pimekoopia</string>
-  <string name="font_size_message_view_additional_headers">Täiendavad pealkirjad</string>
   <string name="font_size_message_view_subject">Teema</string>
   <string name="font_size_message_view_date">Kellaaeg ja kuupäev</string>
   <string name="font_size_message_view_content">Kirja põhiosa</string>

app/ui/legacy/src/main/res/values-eu/strings.xml

@@ -729,10 +729,6 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="font_size_message_list_preview">Aurreikusi</string>
   <string name="font_size_message_view">Mezuak</string>
   <string name="font_size_message_view_sender">Bidaltzailea</string>
-  <string name="font_size_message_view_to">Nori</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Goiburu osagarriak</string>
   <string name="font_size_message_view_subject">Gaia</string>
   <string name="font_size_message_view_date">Ordua eta data</string>
   <string name="font_size_message_view_content">Mezuaren gorputza</string>

app/ui/legacy/src/main/res/values-fa/strings.xml

@@ -723,10 +723,6 @@
   <string name="font_size_message_list_preview">پیش‌نمایش</string>
   <string name="font_size_message_view">پیام‌ها</string>
   <string name="font_size_message_view_sender">فرستنده</string>
-  <string name="font_size_message_view_to">به</string>
-  <string name="font_size_message_view_cc">رونوشت به</string>
-  <string name="font_size_message_view_bcc">مخفیانه به</string>
-  <string name="font_size_message_view_additional_headers">سرایندهای اضافی</string>
   <string name="font_size_message_view_subject">موضوع</string>
   <string name="font_size_message_view_date">ساعت و تاریخ</string>
   <string name="font_size_message_view_content">متن پیام</string>

app/ui/legacy/src/main/res/values-fi/strings.xml

@@ -729,10 +729,6 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="font_size_message_list_preview">Esikatselu</string>
   <string name="font_size_message_view">Viestinäkymä</string>
   <string name="font_size_message_view_sender">Lähettäjä</string>
-  <string name="font_size_message_view_to">Vastaanottaja</string>
-  <string name="font_size_message_view_cc">Kopio</string>
-  <string name="font_size_message_view_bcc">Piilokopio</string>
-  <string name="font_size_message_view_additional_headers">Tarkemmat otsikkotiedot</string>
   <string name="font_size_message_view_subject">Viestin aihe</string>
   <string name="font_size_message_view_date">Aika ja päivämäärä</string>
   <string name="font_size_message_view_content">Viestin sisältö</string>

app/ui/legacy/src/main/res/values-fr/strings.xml

@@ -733,10 +733,6 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions
   <string name="font_size_message_list_preview">Aperçu</string>
   <string name="font_size_message_view">Courriels</string>
   <string name="font_size_message_view_sender">Expéditeur</string>
-  <string name="font_size_message_view_to">À</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Cci</string>
-  <string name="font_size_message_view_additional_headers">En-têtes supplémentaires</string>
   <string name="font_size_message_view_subject">Objet</string>
   <string name="font_size_message_view_date">Horodatage</string>
   <string name="font_size_message_view_content">Corps du courriel</string>

app/ui/legacy/src/main/res/values-fy/strings.xml

@@ -725,10 +725,6 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="font_size_message_list_preview">Foarbyld</string>
   <string name="font_size_message_view">Berjochten</string>
   <string name="font_size_message_view_sender">Ofstjoerder</string>
-  <string name="font_size_message_view_to">Oan</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Ekstra koppen</string>
   <string name="font_size_message_view_subject">Underwerp</string>
   <string name="font_size_message_view_date">Tiid en datum</string>
   <string name="font_size_message_view_content">Berichtynhâld</string>

app/ui/legacy/src/main/res/values-gd/strings.xml

@@ -631,10 +631,6 @@
   <string name="font_size_message_list_preview">Ro-shealladh</string>
   <string name="font_size_message_view">Teachdaireachdan</string>
   <string name="font_size_message_view_sender">Seòladair</string>
-  <string name="font_size_message_view_to">Gu</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Bannan-cinn a bharrachd</string>
   <string name="font_size_message_view_subject">Cuspair</string>
   <string name="font_size_message_view_date">Ceann-là ’s àm</string>
   <string name="font_size_message_view_content">Bodhaig na teachdaireachd</string>

app/ui/legacy/src/main/res/values-gl-rES/strings.xml

@@ -536,10 +536,6 @@
   <string name="font_size_message_list_preview">Previsualización</string>
   <string name="font_size_message_view">Mensaxes</string>
   <string name="font_size_message_view_sender">Remitente</string>
-  <string name="font_size_message_view_to">Para</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Cabeceiras adicionais</string>
   <string name="font_size_message_view_subject">Asunto</string>
   <string name="font_size_message_view_date">Hora e data</string>
   <string name="font_size_message_view_content">Corpo da mensaxe</string>

app/ui/legacy/src/main/res/values-gl/strings.xml

@@ -689,10 +689,6 @@ Por favor envíen informes de fallos, contribúa con novas características e co
   <string name="font_size_message_list_preview">Vista previa</string>
   <string name="font_size_message_view">mensaxes</string>
   <string name="font_size_message_view_sender">Remitente</string>
-  <string name="font_size_message_view_to">Para</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">CCo</string>
-  <string name="font_size_message_view_additional_headers">Encabezados adicionáis</string>
   <string name="font_size_message_view_subject">Asunto</string>
   <string name="font_size_message_view_date">Data e Hora</string>
   <string name="font_size_message_view_content">Corpo da mensaxe</string>

app/ui/legacy/src/main/res/values-hr/strings.xml

@@ -627,10 +627,6 @@
   <string name="font_size_message_list_preview">Pedpregled</string>
   <string name="font_size_message_view">Poruke</string>
   <string name="font_size_message_view_sender">Pošiljatelj</string>
-  <string name="font_size_message_view_to">Za</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Dodatna zaglavlja</string>
   <string name="font_size_message_view_subject">Subjekt</string>
   <string name="font_size_message_view_date">Vrijeme i datum</string>
   <string name="font_size_message_view_content">Tijelo poruke</string>

app/ui/legacy/src/main/res/values-hu/strings.xml

@@ -721,10 +721,6 @@ Hibajelentések beküldésével közreműködhet az új funkciókban, és kérd
   <string name="font_size_message_list_preview">Előnézet</string>
   <string name="font_size_message_view">Üzenetek</string>
   <string name="font_size_message_view_sender">Feladó</string>
-  <string name="font_size_message_view_to">Címzett</string>
-  <string name="font_size_message_view_cc">Másolat</string>
-  <string name="font_size_message_view_bcc">Titkos másolat</string>
-  <string name="font_size_message_view_additional_headers">További fejlécek</string>
   <string name="font_size_message_view_subject">Tárgy</string>
   <string name="font_size_message_view_date">Idő és dátum</string>
   <string name="font_size_message_view_content">Üzenet törzse</string>

app/ui/legacy/src/main/res/values-in/strings.xml

@@ -663,10 +663,6 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di
   <string name="font_size_message_list_preview">Pratinjau</string>
   <string name="font_size_message_view">Pesan</string>
   <string name="font_size_message_view_sender">Pengirim</string>
-  <string name="font_size_message_view_to">Kepada</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Header tambahan</string>
   <string name="font_size_message_view_subject">Subyek</string>
   <string name="font_size_message_view_date">Tanggal dan waktu</string>
   <string name="font_size_message_view_content">Isi pesan</string>

app/ui/legacy/src/main/res/values-is/strings.xml

@@ -724,10 +724,6 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="font_size_message_list_preview">Forskoðun</string>
   <string name="font_size_message_view">Skilaboð</string>
   <string name="font_size_message_view_sender">Sendandi</string>
-  <string name="font_size_message_view_to">Til</string>
-  <string name="font_size_message_view_cc">Afrit</string>
-  <string name="font_size_message_view_bcc">Falið afrit</string>
-  <string name="font_size_message_view_additional_headers">Viðbótarhausar</string>
   <string name="font_size_message_view_subject">Viðfangsefni</string>
   <string name="font_size_message_view_date">Tími og dagsetning</string>
   <string name="font_size_message_view_content">Efni skilaboða</string>

app/ui/legacy/src/main/res/values-it/strings.xml

@@ -726,10 +726,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="font_size_message_list_preview">Anteprima</string>
   <string name="font_size_message_view">Messaggi</string>
   <string name="font_size_message_view_sender">Mittente</string>
-  <string name="font_size_message_view_to">A</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Ccn</string>
-  <string name="font_size_message_view_additional_headers">Intestazioni aggiuntive</string>
   <string name="font_size_message_view_subject">Oggetto</string>
   <string name="font_size_message_view_date">Ora e data</string>
   <string name="font_size_message_view_content">Corpo del messaggio</string>

app/ui/legacy/src/main/res/values-iw/strings.xml

@@ -538,10 +538,6 @@
   <string name="font_size_message_list_preview">תצוגה מקדימה</string>
   <string name="font_size_message_view">הודעות</string>
   <string name="font_size_message_view_sender">שולח</string>
-  <string name="font_size_message_view_to">ל</string>
-  <string name="font_size_message_view_cc">עותק</string>
-  <string name="font_size_message_view_bcc">עותק מוסתר</string>
-  <string name="font_size_message_view_additional_headers">כותרות נוספות</string>
   <string name="font_size_message_view_subject">כותרת</string>
   <string name="font_size_message_view_date">שעה ותאריך</string>
   <string name="font_size_message_view_content">גוף ההודעה</string>

app/ui/legacy/src/main/res/values-ja/strings.xml

@@ -728,10 +728,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="font_size_message_list_preview">プレビュー</string>
   <string name="font_size_message_view">メッセージ表示</string>
   <string name="font_size_message_view_sender">送信者</string>
-  <string name="font_size_message_view_to">To</string>
-  <string name="font_size_message_view_cc">CC</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">追加ヘッダ</string>
   <string name="font_size_message_view_subject">件名</string>
   <string name="font_size_message_view_date">日時</string>
   <string name="font_size_message_view_content">本文</string>

app/ui/legacy/src/main/res/values-ko/strings.xml

@@ -579,10 +579,6 @@
   <string name="font_size_message_list_preview">미리 보기</string>
   <string name="font_size_message_view">메시지</string>
   <string name="font_size_message_view_sender">보낸이</string>
-  <string name="font_size_message_view_to">받는이</string>
-  <string name="font_size_message_view_cc">참조</string>
-  <string name="font_size_message_view_bcc">숨은 참조</string>
-  <string name="font_size_message_view_additional_headers">추가 헤더 정보</string>
   <string name="font_size_message_view_subject">제목</string>
   <string name="font_size_message_view_date">시간 및 날짜</string>
   <string name="font_size_message_view_content">내용</string>

app/ui/legacy/src/main/res/values-lt/strings.xml

@@ -722,10 +722,6 @@ Pateikite pranešimus apie klaidas, prisidėkite prie naujų funkcijų kūrimo i
   <string name="font_size_message_list_preview">Peržiūra</string>
   <string name="font_size_message_view">Laiškai</string>
   <string name="font_size_message_view_sender">Siuntėjas</string>
-  <string name="font_size_message_view_to">Kam</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Slapta kopija</string>
-  <string name="font_size_message_view_additional_headers">Papildomos antraštės</string>
   <string name="font_size_message_view_subject">Tema</string>
   <string name="font_size_message_view_date">Laikas ir data</string>
   <string name="font_size_message_view_content">Pagrindinė laiško dalis</string>

app/ui/legacy/src/main/res/values-lv/strings.xml

@@ -690,10 +690,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="font_size_message_list_preview">Priekšskatījums</string>
   <string name="font_size_message_view">Vēstules</string>
   <string name="font_size_message_view_sender">Sūtītājs</string>
-  <string name="font_size_message_view_to">Kam</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Neredzamais</string>
-  <string name="font_size_message_view_additional_headers">Izvērsta vēstules papildinformācija</string>
   <string name="font_size_message_view_subject">Temats</string>
   <string name="font_size_message_view_date">Laiks un datums</string>
   <string name="font_size_message_view_content">Vēstules pamatteksts</string>

app/ui/legacy/src/main/res/values-ml/strings.xml

@@ -691,10 +691,6 @@
   <string name="font_size_message_list_preview">പ്രിവ്യൂ</string>
   <string name="font_size_message_view">സന്ദേശങ്ങൾ</string>
   <string name="font_size_message_view_sender">അയച്ചയാൾ</string>
-  <string name="font_size_message_view_to">To</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">അധിക തലക്കെട്ടുകൾ</string>
   <string name="font_size_message_view_subject">വിഷയം</string>
   <string name="font_size_message_view_date">സമയവും തീയതിയും</string>
   <string name="font_size_message_view_content">സന്ദേശ ബോഡി</string>

app/ui/legacy/src/main/res/values-nb/strings.xml

@@ -662,10 +662,6 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="font_size_message_list_preview">Forhåndsvisning</string>
   <string name="font_size_message_view">Meldinger</string>
   <string name="font_size_message_view_sender">Avsender</string>
-  <string name="font_size_message_view_to">Til</string>
-  <string name="font_size_message_view_cc">Kopi</string>
-  <string name="font_size_message_view_bcc">Blindkopi</string>
-  <string name="font_size_message_view_additional_headers">Flere meldingshoder</string>
   <string name="font_size_message_view_subject">Emne</string>
   <string name="font_size_message_view_date">Tid og dato</string>
   <string name="font_size_message_view_content">Meldingstekst</string>

app/ui/legacy/src/main/res/values-nl/strings.xml

@@ -725,10 +725,6 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op
   <string name="font_size_message_list_preview">Voorbeeld</string>
   <string name="font_size_message_view">Berichten</string>
   <string name="font_size_message_view_sender">Afzender</string>
-  <string name="font_size_message_view_to">Bericht ontvanger (Aan)</string>
-  <string name="font_size_message_view_cc">Bericht ontvanger (CC)</string>
-  <string name="font_size_message_view_bcc">Bericht ontvanger (BCC)</string>
-  <string name="font_size_message_view_additional_headers">Extra koppen</string>
   <string name="font_size_message_view_subject">Onderwerp</string>
   <string name="font_size_message_view_date">Tijd en datum</string>
   <string name="font_size_message_view_content">Berichtinhoud</string>

app/ui/legacy/src/main/res/values-pl/strings.xml

@@ -734,10 +734,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi
   <string name="font_size_message_list_preview">Podgląd</string>
   <string name="font_size_message_view">Wiadomości</string>
   <string name="font_size_message_view_sender">Nadawca</string>
-  <string name="font_size_message_view_to">Adresat (Do:)</string>
-  <string name="font_size_message_view_cc">Odbiorca kopii (DW:)</string>
-  <string name="font_size_message_view_bcc">UDW</string>
-  <string name="font_size_message_view_additional_headers">Dodatkowe nagłówki</string>
   <string name="font_size_message_view_subject">Temat</string>
   <string name="font_size_message_view_date">Czas i data</string>
   <string name="font_size_message_view_content">Treść wiadomości</string>

app/ui/legacy/src/main/res/values-pt-rBR/strings.xml

@@ -731,10 +731,6 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú
   <string name="font_size_message_list_preview">Visualização</string>
   <string name="font_size_message_view">Mensagens</string>
   <string name="font_size_message_view_sender">Remetente</string>
-  <string name="font_size_message_view_to">Para</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Cco</string>
-  <string name="font_size_message_view_additional_headers">Cabeçalhos adicionais</string>
   <string name="font_size_message_view_subject">Assunto</string>
   <string name="font_size_message_view_date">Data e hora</string>
   <string name="font_size_message_view_content">Corpo da mensagem</string>

app/ui/legacy/src/main/res/values-pt-rPT/strings.xml

@@ -718,10 +718,6 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col
   <string name="font_size_message_list_preview">Pré-visualização</string>
   <string name="font_size_message_view">Mensagens</string>
   <string name="font_size_message_view_sender">Remetente</string>
-  <string name="font_size_message_view_to">Para</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Cabeçalhos adicionais</string>
   <string name="font_size_message_view_subject">Assunto</string>
   <string name="font_size_message_view_date">Data e hora</string>
   <string name="font_size_message_view_content">Corpo da mensagem</string>

app/ui/legacy/src/main/res/values-ro/strings.xml

@@ -728,10 +728,6 @@ Uneori datorită faptului că cineva încearcă să te atace pe tine sau serveru
   <string name="font_size_message_list_preview">Previzualizare</string>
   <string name="font_size_message_view">Mesaje</string>
   <string name="font_size_message_view_sender">Expeditor</string>
-  <string name="font_size_message_view_to">Către</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Antete adiționale</string>
   <string name="font_size_message_view_subject">Subiect</string>
   <string name="font_size_message_view_date">Timp și dată</string>
   <string name="font_size_message_view_content">Conținut mesaj</string>

app/ui/legacy/src/main/res/values-ru/strings.xml

@@ -733,10 +733,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="font_size_message_list_preview">Просмотр</string>
   <string name="font_size_message_view">Сообщение</string>
   <string name="font_size_message_view_sender">Отправитель</string>
-  <string name="font_size_message_view_to">Кому</string>
-  <string name="font_size_message_view_cc">Копия</string>
-  <string name="font_size_message_view_bcc">Скрытая</string>
-  <string name="font_size_message_view_additional_headers">Все заголовки</string>
   <string name="font_size_message_view_subject">Тема</string>
   <string name="font_size_message_view_date">Дата и время</string>
   <string name="font_size_message_view_content">Тело сообщения</string>

app/ui/legacy/src/main/res/values-sk/strings.xml

@@ -669,10 +669,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="font_size_message_list_preview">Náhľad</string>
   <string name="font_size_message_view">Správy</string>
   <string name="font_size_message_view_sender">Odosielateľ</string>
-  <string name="font_size_message_view_to">Komu</string>
-  <string name="font_size_message_view_cc">Kópia</string>
-  <string name="font_size_message_view_bcc">Skrytá kópia</string>
-  <string name="font_size_message_view_additional_headers">Prídavné hlavičky</string>
   <string name="font_size_message_view_subject">Skrytá kópia</string>
   <string name="font_size_message_view_date">Čas a dátum</string>
   <string name="font_size_message_view_content">Telo správy</string>

app/ui/legacy/src/main/res/values-sl/strings.xml

@@ -727,10 +727,6 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="font_size_message_list_preview">Predogled</string>
   <string name="font_size_message_view">Sporočila</string>
   <string name="font_size_message_view_sender">Pošiljatelj</string>
-  <string name="font_size_message_view_to">Za</string>
-  <string name="font_size_message_view_cc">Kp</string>
-  <string name="font_size_message_view_bcc">Skp</string>
-  <string name="font_size_message_view_additional_headers">Dodatni zapisi glave</string>
   <string name="font_size_message_view_subject">Zadeva</string>
   <string name="font_size_message_view_date">Čas in datum</string>
   <string name="font_size_message_view_content">Telo sporočila</string>

app/ui/legacy/src/main/res/values-sq/strings.xml

@@ -729,10 +729,6 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="font_size_message_list_preview">Paraparje</string>
   <string name="font_size_message_view">Mesazhe</string>
   <string name="font_size_message_view_sender">Dërgues</string>
-  <string name="font_size_message_view_to">Për</string>
-  <string name="font_size_message_view_cc">Cc</string>
-  <string name="font_size_message_view_bcc">Bcc</string>
-  <string name="font_size_message_view_additional_headers">Krye shtesë</string>
   <string name="font_size_message_view_subject">Subjekt</string>
   <string name="font_size_message_view_date">Kohë dhe datë</string>
   <string name="font_size_message_view_content">Trup i mesazhit</string>

app/ui/legacy/src/main/res/values-sr/strings.xml

@@ -667,10 +667,6 @@
   <string name="font_size_message_list_preview">Преглед</string>
   <string name="font_size_message_view">Поруке</string>
   <string name="font_size_message_view_sender">Пошиљалац</string>
-  <string name="font_size_message_view_to">За</string>
-  <string name="font_size_message_view_cc">Коп</string>
-  <string name="font_size_message_view_bcc">СКоп</string>
-  <string name="font_size_message_view_additional_headers">Додатна заглавља</string>
   <string name="font_size_message_view_subject">Тема</string>
   <string name="font_size_message_view_date">Време и датум</string>
   <string name="font_size_message_view_content">Тело поруке</string>

app/ui/legacy/src/main/res/values-sv/strings.xml

@@ -730,10 +730,6 @@ Skicka in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="font_size_message_list_preview">Förhandsgranskning</string>
   <string name="font_size_message_view">Meddelanden</string>
   <string name="font_size_message_view_sender">Avsändare</string>
-  <string name="font_size_message_view_to">Till</string>
-  <string name="font_size_message_view_cc">Kopia</string>
-  <string name="font_size_message_view_bcc">Blindkopia</string>
-  <string name="font_size_message_view_additional_headers">Ytterligare meddelanderubriker</string>
   <string name="font_size_message_view_subject">Ämne</string>
   <string name="font_size_message_view_date">Tid och datum</string>
   <string name="font_size_message_view_content">Innehåll</string>

app/ui/legacy/src/main/res/values-tr/strings.xml

@@ -705,10 +705,6 @@ Microsoft Exchange ile konuşurken bazı tuhaflıklar yaşadığını not ediniz
   <string name="font_size_message_list_preview">Önizleme</string>
   <string name="font_size_message_view">Mesajlar</string>
   <string name="font_size_message_view_sender">Gönderen</string>
-  <string name="font_size_message_view_to">Kime</string>
-  <string name="font_size_message_view_cc">Bilgi</string>
-  <string name="font_size_message_view_bcc">Gizli Kopya</string>
-  <string name="font_size_message_view_additional_headers">Ek başlıklar</string>
   <string name="font_size_message_view_subject">Konu</string>
   <string name="font_size_message_view_date">Saat ve Tarih</string>
   <string name="font_size_message_view_content">Mesaj gövdesi</string>

app/ui/legacy/src/main/res/values-uk/strings.xml

@@ -728,10 +728,6 @@ K-9 Mail — це вільний клієнт електронної пошти
   <string name="font_size_message_list_preview">Попередній перегляд</string>
   <string name="font_size_message_view">Повідомлення</string>
   <string name="font_size_message_view_sender">Відправник</string>
-  <string name="font_size_message_view_to">Кому</string>
-  <string name="font_size_message_view_cc">Копія</string>
-  <string name="font_size_message_view_bcc">Прихована копія</string>
-  <string name="font_size_message_view_additional_headers">Додаткові заголовки</string>
   <string name="font_size_message_view_subject">Тема</string>
   <string name="font_size_message_view_date">Час і дата</string>
   <string name="font_size_message_view_content">Тіло повідомлення</string>

app/ui/legacy/src/main/res/values-zh-rCN/strings.xml

@@ -728,10 +728,6 @@ K-9 Mail 是 Android 上一款功能强大的免费邮件客户端。
   <string name="font_size_message_list_preview">预览</string>
   <string name="font_size_message_view">邮件</string>
   <string name="font_size_message_view_sender">发件人</string>
-  <string name="font_size_message_view_to">收件人</string>
-  <string name="font_size_message_view_cc">抄送</string>
-  <string name="font_size_message_view_bcc">秘送</string>
-  <string name="font_size_message_view_additional_headers">额外的邮件信息</string>
   <string name="font_size_message_view_subject">主题</string>
   <string name="font_size_message_view_date">日期</string>
   <string name="font_size_message_view_content">邮件内容</string>

app/ui/legacy/src/main/res/values-zh-rTW/strings.xml

@@ -721,10 +721,6 @@ K-9 Mail 是 Android 上一款功能強大，免費的電子郵件用戶端。
   <string name="font_size_message_list_preview">預覽</string>
   <string name="font_size_message_view">郵件</string>
   <string name="font_size_message_view_sender">寄件人</string>
-  <string name="font_size_message_view_to">收件人</string>
-  <string name="font_size_message_view_cc">副本</string>
-  <string name="font_size_message_view_bcc">密件副本</string>
-  <string name="font_size_message_view_additional_headers">額外的郵件訊息</string>
   <string name="font_size_message_view_subject">主題</string>
   <string name="font_size_message_view_date">日期</string>
   <string name="font_size_message_view_content">郵件本文內容</string>

app/ui/legacy/src/main/res/values/strings.xml

@@ -876,10 +876,7 @@ Please submit bug reports, contribute new features and ask questions at
 
     <string name="font_size_message_view">Messages</string>
     <string name="font_size_message_view_sender">Sender</string>
-    <string name="font_size_message_view_to">To</string>
+    <string name="font_size_message_view_recipients">Recipients</string>
-    <string name="font_size_message_view_cc">Cc</string>
-    <string name="font_size_message_view_bcc">Bcc</string>
-    <string name="font_size_message_view_additional_headers">Additional headers</string>
     <string name="font_size_message_view_subject">Subject</string>
     <string name="font_size_message_view_date">Time and date</string>
     <string name="font_size_message_view_content">Message body</string>

app/ui/legacy/src/main/res/xml/general_settings.xml

@@ -148,38 +148,6 @@
                     android:title="@string/font_size_message_view"
                     android:key="message_view_fonts">
 
-                    <ListPreference
-                        android:key="message_view_sender_font"
-                        android:title="@string/font_size_message_view_sender"
-                        app:useSimpleSummaryProvider="true"
-                        android:entries="@array/font_entries"
-                        android:entryValues="@array/font_values"
-                        android:dialogTitle="@string/font_size_message_view_sender" />
-
-                    <ListPreference
-                        android:key="message_view_to_font"
-                        android:title="@string/font_size_message_view_to"
-                        app:useSimpleSummaryProvider="true"
-                        android:entries="@array/font_entries"
-                        android:entryValues="@array/font_values"
-                        android:dialogTitle="@string/font_size_message_view_to" />
-
-                    <ListPreference
-                        android:key="message_view_cc_font"
-                        android:title="@string/font_size_message_view_cc"
-                        app:useSimpleSummaryProvider="true"
-                        android:entries="@array/font_entries"
-                        android:entryValues="@array/font_values"
-                        android:dialogTitle="@string/font_size_message_view_cc" />
-
-                    <ListPreference
-                        android:key="message_view_bcc_font"
-                        android:title="@string/font_size_message_view_bcc"
-                        app:useSimpleSummaryProvider="true"
-                        android:entries="@array/font_entries"
-                        android:entryValues="@array/font_values"
-                        android:dialogTitle="@string/font_size_message_view_bcc" />
-
                     <ListPreference
                         android:key="message_view_subject_font"
                         android:title="@string/font_size_message_view_subject"
@@ -188,6 +156,14 @@
                         android:entryValues="@array/font_values"
                         android:dialogTitle="@string/font_size_message_view_subject" />
 
+                    <ListPreference
+                        android:key="message_view_sender_font"
+                        android:title="@string/font_size_message_view_sender"
+                        app:useSimpleSummaryProvider="true"
+                        android:entries="@array/font_entries"
+                        android:entryValues="@array/font_values"
+                        android:dialogTitle="@string/font_size_message_view_sender" />
+
                     <ListPreference
                         android:key="message_view_date_font"
                         android:title="@string/font_size_message_view_date"
@@ -197,12 +173,12 @@
                         android:dialogTitle="@string/font_size_message_view_date" />
 
                     <ListPreference
-                        android:key="message_view_additional_headers_font"
+                        android:key="message_view_recipients_font"
-                        android:title="@string/font_size_message_view_additional_headers"
+                        android:title="@string/font_size_message_view_recipients"
                         app:useSimpleSummaryProvider="true"
                         android:entries="@array/font_entries"
                         android:entryValues="@array/font_values"
-                        android:dialogTitle="@string/font_size_message_view_additional_headers" />
+                        android:dialogTitle="@string/font_size_message_view_recipients" />
 
                     <SeekBarPreference
                         android:key="message_view_content_font_slider"