--- quilt-0.44.orig/quilt/mail.in
+++ quilt-0.44/quilt/mail.in
@@ -154,7 +154,17 @@
 fi
 
 if [ -z "$opt_sender" ]; then
-	hostname=$(hostname -f 2>/dev/null)
+	hostname=nowhere
+	if [ -e /etc/mailname ] ; 
+	then
+		hostname=`cat /etc/mailname`
+	fi
+	
+	if [ "$hostname" = "${hostname/.}" ]
+	then
+		hostname=$(hostname -f 2>/dev/null)
+	fi
+	
 	if [ "$hostname" = "${hostname/.}" ]
 	then
 		hostname=$(hostname)