diff --git a/src/bin/Jamfile b/src/bin/Jamfile
index db4534eb0b..de947dc57e 100644
--- a/src/bin/Jamfile
+++ b/src/bin/Jamfile
@@ -205,11 +205,6 @@ StdBinCommands
 	setvolume.cpp
 	: be libmedia.so [ TargetLibsupc++ ] : $(haiku-utils_rsrc) ;
 
-# standard commands that need libbe.so, libmail.so
-StdBinCommands
-	mail.cpp
-	: be libmail.so : $(haiku-utils_rsrc) ;
-
 # standard commands that need libbe.so, libpackage.so, libsupc++.so
 StdBinCommands
 	findpaths.cpp
diff --git a/src/bin/mail_utils/Jamfile b/src/bin/mail_utils/Jamfile
index ffad6a9802..df3d01968d 100644
--- a/src/bin/mail_utils/Jamfile
+++ b/src/bin/mail_utils/Jamfile
@@ -8,6 +8,12 @@ if $(TARGET_PLATFORM) != haiku {
 
 UsePrivateHeaders mail ;
 
+StdBinCommands
+	mail.cpp
+	: be mail
+	: mail.rdef
+	;
+
 StdBinCommands
 	mail2mbox.cpp
 	: be
diff --git a/src/bin/mail.cpp b/src/bin/mail_utils/mail.cpp
similarity index 100%
rename from src/bin/mail.cpp
rename to src/bin/mail_utils/mail.cpp
diff --git a/src/bin/mail_utils/mail.rdef b/src/bin/mail_utils/mail.rdef
new file mode 100644
index 0000000000..39a0a83d28
--- /dev/null
+++ b/src/bin/mail_utils/mail.rdef
@@ -0,0 +1,13 @@
+resource app_flags B_MULTIPLE_LAUNCH | B_ARGV_ONLY;
+
+resource app_signature "application/x-vnd.Haiku-mail_utils-mail";
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+	variety = B_APPV_FINAL,
+	internal = 1,
+	short_info = "mail",
+	long_info = "mail"
+};