diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 7f69f3ef00..a17afb9d55 100644
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -30,7 +30,9 @@ IN: builder
 
 SYMBOL: builder-recipients
 
-: tag-subject ( str -- str ) `{ "builder@" ,[ host-name ] ": " , } concat ;
+: host-name* ( -- name ) host-name "." split first ;
+
+: tag-subject ( str -- str ) `{ "builder@" ,[ host-name* ] ": " , } concat ;
 
 : email-string ( subject -- )
   `{ "mutt" "-s" ,[ tag-subject ] %[ builder-recipients get ] }
@@ -54,7 +56,7 @@ SYMBOL: builder-recipients
 
 : run-or-send-file ( desc message file -- )
   >r >r [ try-process ]         curry
-  r> r> [ email-string throw ] 2curry
+  r> r> [ email-file throw ] 2curry
   recover ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -158,11 +160,11 @@ SYMBOL: build-status
   builder-test "builder.test fatal error" run-or-notify
   
   "../load-everything-log" exists?
-  [ "builder: load-everything" "../load-everything-log" email-file ]
+  [ "load-everything" "../load-everything-log" email-file ]
   when
 
   "../failing-tests" exists?
-  [ "builder: failing tests" "../failing-tests" email-file ]
+  [ "failing tests" "../failing-tests" email-file ]
   when
 
   "ready" build-status set-global ;