diff --git a/src/switch_utils.c b/src/switch_utils.c
index fa94ced566..4ba48464af 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -579,10 +579,15 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
 	if (ifd) {
 		close(ifd);
 	}
+
+	if (switch_strlen_zero(from)) {
+		from = "freeswitch";
+	}
+
 #ifdef WIN32
-	switch_snprintf(buf, B64BUFFLEN, "type %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to);
+	switch_snprintf(buf, B64BUFFLEN, "type %s | %s %s -f %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, from, to);
 #else
-	switch_snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to);
+	switch_snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s -f %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, from, to);
 #endif
 	if (switch_system(buf, SWITCH_TRUE) < 0) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf);