diff --git a/desktop/geary-autostart.desktop.in b/desktop/geary-autostart.desktop.in
index e051d8c5..c6d5a6d1 100644
--- a/desktop/geary-autostart.desktop.in
+++ b/desktop/geary-autostart.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Geary
-_GenericName=Mail Client
+_GenericName=Email
 _X-GNOME-FullName=Geary Mail
 _Comment=Send and receive email
 _Keywords=Email;E-mail;Mail;
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 563fd3e7..256b8048 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -18,8 +18,8 @@ public class GearyApplication : Gtk.Application {
     public const string NAME = "Geary";
     public const string PRGNAME = "geary";
     public const string APP_ID = "org.gnome.Geary";
-    public const string DESCRIPTION = _("Mail Client");
     public const string COPYRIGHT = _("Copyright 2016 Software Freedom Conservancy Inc.");
+    public const string DESCRIPTION = _("Send and receive email");
     public const string WEBSITE = "https://wiki.gnome.org/Apps/Geary";
     public const string WEBSITE_LABEL = _("Visit the Geary web site");
     public const string BUGREPORT = "https://wiki.gnome.org/Apps/Geary/ReportingABug";