diff --git a/master.cfg b/master.cfg
index f84be4c..6b3f1e5 100644
--- a/master.cfg
+++ b/master.cfg
@@ -162,7 +162,7 @@ def SendRootMessageGDBTesters (branch, change):
     text += '\n'.join (change.comments.split ('\n')[1:])
 
     chg_title = change.comments.split ('\n')[0]
-    text = text.decode ('ascii', 'ignore')
+    text = text.encode ('ascii', 'ignore').decode ('ascii')
     mail = MIMEText (text)
     if branch == 'master':
         sbj = "[binutils-gdb] %s" % chg_title
@@ -369,6 +369,7 @@ send to the gdb-testers mailing list."""
     text += "\n"
 
     if report_build_breakage:
+        subj += " *** BREAKAGE ***"
         SendAuthorMessage (name, cur_change, text)
     else:
         # There is no build breakage anymore!  Yay!  Now, let's see if