Index: balsa-2.4.9/configure.in
===================================================================
--- balsa-2.4.9.orig/configure.in
+++ balsa-2.4.9/configure.in
@@ -281,6 +281,7 @@ dnl ####################################
 dnl GNOME libs
 dnl #####################################################################
 if test x$with_gnome != xno; then
+   TOOLKIT_CATEGORIES="GNOME;GTK;"
    gnome_extras="libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0"
    AC_MSG_CHECKING([whether we have gnome-keyring])
    if $PKG_CONFIG --atleast-version=1.0 gnome-keyring-1; then
@@ -298,9 +299,11 @@ if test x$with_gnome != xno; then
    AC_MSG_RESULT($with_gnome_keyring)
    AC_DEFINE(HAVE_GNOME,1,[Defined when gnome libs are available.])
 else
+   TOOLKIT_CATEGORIES="GTK;"
    gnome_extras=""
 fi
 AM_CONDITIONAL([BUILD_WITH_GNOME], [test $with_gnome = "yes"])
+AC_SUBST(TOOLKIT_CATEGORIES)
 
 dnl #####################################################################
 dnl 4. Libraries.
@@ -997,6 +1000,8 @@ AC_OUTPUT([
 Makefile
 balsa.1
 balsa.spec
+balsa.desktop.in
+balsa-mailto-handler.desktop.in
 po/Makefile.in
 sounds/Makefile
 images/Makefile
Index: balsa-2.4.9/Makefile.am
===================================================================
--- balsa-2.4.9.orig/Makefile.am
+++ balsa-2.4.9/Makefile.am
@@ -9,8 +9,8 @@ pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = gnome-balsa2.png
 
 desktopdir = $(datadir)/applications
-desktop_in_files = balsa.desktop.in
-desktop_DATA = balsa.desktop
+desktop_in_files = balsa.desktop.in balsa-mailto-handler.desktop.in
+desktop_DATA = balsa.desktop balsa-mailto-handler.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 balsa_extra_dist =		\
@@ -19,7 +19,6 @@ balsa_extra_dist =		\
 	balsa-mail-style.xml	\
 	balsa-mail.lang		\
 	balsa.1.in		\
-	balsa.desktop.in	\
 	balsa.spec.in		\
 	bootstrap.sh		\
 	docs/mh-mail-HOWTO	\
Index: balsa-2.4.9/balsa.desktop.in.in
===================================================================
--- balsa-2.4.9.orig/balsa.desktop.in
+++ balsa-2.4.9/balsa.desktop.in.in
@@ -1,6 +1,8 @@
 [Desktop Entry]
 _Name=Balsa
 _Comment=E-Mail utility
+_GenericName=Mail Client
+X-GNOME-FullName=Balsa Mail Client
 TryExec=balsa
 Exec=balsa
 Icon=gnome-balsa2
@@ -9,4 +9,4 @@ Icon=gnome-balsa2
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Network;Email;
+Categories=@TOOLKIT_CATEGORIES@Network;Email;
Index: balsa-2.4.9/balsa-mailto-handler.desktop.in.in
===================================================================
--- balsa-2.4.9.orig/balsa.desktop.in
+++ balsa-2.4.9/balsa-mailto-handler.desktop.in.in
@@ -1,10 +1,14 @@
 [Desktop Entry]
 _Name=Balsa
 _Comment=E-Mail utility
+_GenericName=Mail Client
+X-GNOME-FullName=Balsa Mail Client
 TryExec=balsa
-Exec=balsa
+Exec=balsa -m %U
 Icon=gnome-balsa2
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Network;Email;
+Categories=@TOOLKIT_CATEGORIES@Network;Email;
+MimeType=x-scheme-handler/mailto;
+NoDisplay=true
