diff --git a/app/src/main/res/drawable/baseline_people_outline_24.xml b/app/src/main/res/drawable/baseline_people_outline_24.xml
new file mode 100644
index 0000000000..3c82643e5a
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_people_outline_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16.5,13c-1.2,0 -3.07,0.34 -4.5,1 -1.43,-0.67 -3.3,-1 -4.5,-1C5.33,13 1,14.08 1,16.25L1,19h22v-2.75c0,-2.17 -4.33,-3.25 -6.5,-3.25zM12.5,17.5h-10v-1.25c0,-0.54 2.56,-1.75 5,-1.75s5,1.21 5,1.75v1.25zM21.5,17.5L14,17.5v-1.25c0,-0.46 -0.2,-0.86 -0.52,-1.22 0.88,-0.3 1.96,-0.53 3.02,-0.53 2.44,0 5,1.21 5,1.75v1.25zM7.5,12c1.93,0 3.5,-1.57 3.5,-3.5S9.43,5 7.5,5 4,6.57 4,8.5 5.57,12 7.5,12zM7.5,6.5c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM16.5,12c1.93,0 3.5,-1.57 3.5,-3.5S18.43,5 16.5,5 13,6.57 13,8.5s1.57,3.5 3.5,3.5zM16.5,6.5c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index e496b78d39..63e352aea4 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -78,6 +78,17 @@
                 app:layout_constraintTop_toTopOf="@+id/etTo"
                 app:srcCompat="@drawable/baseline_person_add_24" />
 
+            <ImageView
+                android:id="@+id/ivCcLegend"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:contentDescription="@string/title_cc"
+                android:src="@drawable/baseline_people_24"
+                app:layout_constraintBottom_toBottomOf="@id/etBcc"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/etTo" />
+
             <MultiAutoCompleteTextView
                 android:id="@+id/etCc"
                 android:layout_width="0dp"
@@ -88,7 +99,7 @@
                 android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/ivCcAdd"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toEndOf="@id/ivCcLegend"
                 app:layout_constraintTop_toBottomOf="@+id/etTo" />
 
             <ImageButton
@@ -105,6 +116,17 @@
                 app:layout_constraintTop_toTopOf="@+id/etCc"
                 app:srcCompat="@drawable/baseline_person_add_24" />
 
+            <ImageView
+                android:id="@+id/ivBccLegend"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:contentDescription="@string/title_bcc"
+                android:src="@drawable/baseline_people_outline_24"
+                app:layout_constraintBottom_toBottomOf="@id/etBcc"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/etBcc" />
+
             <MultiAutoCompleteTextView
                 android:id="@+id/etBcc"
                 android:layout_width="0dp"
@@ -115,14 +137,13 @@
                 android:inputType="textEmailAddress"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/ivBccAdd"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toEndOf="@id/ivBccLegend"
                 app:layout_constraintTop_toBottomOf="@+id/etCc" />
 
             <ImageButton
                 android:id="@+id/ivBccAdd"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_marginStart="6dp"
                 android:layout_marginEnd="6dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_legend_pick"
@@ -353,7 +374,7 @@
                 android:id="@+id/grpAddresses"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                app:constraint_referenced_ids="etCc,ivCcAdd,etBcc,ivBccAdd" />
+                app:constraint_referenced_ids="ivCcLegend,etCc,ivCcAdd,ivBccLegend,etBcc,ivBccAdd" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/grpAttachments"