diff --git a/yaml/degoogle.yml b/yaml/degoogle.yml
index c44be3e..a950859 100644
--- a/yaml/degoogle.yml
+++ b/yaml/degoogle.yml
@@ -481,7 +481,7 @@ web based products:
       text: |
         Jitsi is an open-source secure video conferencing platform. No account is needed to use it, simply enter a Room Name to join or host a meeting. The host is able to kick rogue users from the call. Works directly in your browser, with apps available for iOS and Android. It is not necessary to self-host, but self-hosting is an option for those who wish to. Very low latency and easy to set up. A free public server is available at [meet.jit.si](https://meet.jit.si). (**5-eyes** server)
   gmail:
-    - title: Gmail
+    - title: Gmail (mail service)
     - notes:
       - This is just for the Gmail service, not a client
     - name: Forward Email
@@ -1107,8 +1107,8 @@ mobile applications:
       eyes: null
       text: |
         Wrapper of Syncthing for Android. Available on F-Droid. Also consider [Syncthing-Fork](https://f-droid.org/en/packages/com.github.catfriend1.syncthingandroid/) which uses a native Android UI rather than the default web UI.
-  gmail:
-    - title: Gmail
+  gmail_app:
+    - title: Gmail (smartphone app)
     - name: Protonmail
       url: https://protonmail.com/support/knowledge-base/android/
       eyes: null
@@ -1131,11 +1131,18 @@ mobile applications:
       eyes: null
       text: |
         Available from F-Droid.
-    - name: Posteo
-      url: https://posteo.de/
-      eyes: 14
+    - name: K-9 Mail
+      url: https://k9mail.github.io/
+      fdroid: com.fsck.k9
+      eyes: null
       text: |
-        Any **open-source mail client** such as: [K-9 Mail](https://k9mail.github.io/) and [FairEmail](https://email.faircode.eu/). Both are available on F-Droid.
+        Available on F-Droid.
+    - name: FairEmail
+      url: https://email.faircode.eu/
+      fdroid: eu.faircode.email
+      eyes: null
+      text: |
+        Available on F-Droid.
     - name: Mailbox.org
       url: https://mailbox.org/
       eyes: 14