diff --git a/CHANGES.txt b/CHANGES.txt
index a0d10366..dd71acd6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,8 @@ Fixed:
 - issue2551283 - fail if version 2.4.9 of markdown2 is used, it broke
   [issue1](issue1) style links. Support markdown2 2.4.8 and earlier
   and 2.4.10 with its new schema filtering method. (John Rouillard)
+- multiple flake8 fixes (John Rouillard)
+- rename loop variable in 'for sendto in sendto:' (John Rouillard)
 
 Features:
 
diff --git a/roundup/roundupdb.py b/roundup/roundupdb.py
index 1b83ff5c..47a1b3de 100644
--- a/roundup/roundupdb.py
+++ b/roundup/roundupdb.py
@@ -577,7 +577,7 @@ def send_message(self, issueid, msgid, note, sendto, from_address=None,
         # can't fiddle the recipients in the message ... worth testing
         # and/or fixing some day
         first = True
-        for sendto in sendto:
+        for to_addr in sendto:
             # create the message
             mailer = Mailer(self.db.config)
 
@@ -721,18 +721,18 @@ def send_message(self, issueid, msgid, note, sendto, from_address=None,
                 message.set_payload(body, message.get_charset())
 
             if crypt:
-                send_msg = self.encrypt_to(message, sendto)
+                send_msg = self.encrypt_to(message, to_addr)
             else:
                 send_msg = message
-            mailer.set_message_attributes(send_msg, sendto, subject, author)
+            mailer.set_message_attributes(send_msg, to_addr, subject, author)
             if crypt:
                 send_msg['Message-Id'] = message['Message-Id']
                 send_msg['Reply-To'] = message['Reply-To']
                 if message.get('In-Reply-To'):
                     send_msg['In-Reply-To'] = message['In-Reply-To']
 
-            if sendto:
-                mailer.smtp_send(sendto, send_msg.as_string())
+            if to_addr:
+                mailer.smtp_send(to_addr, send_msg.as_string())
             if first:
                 if crypt:
                     # send individual bcc mails, otherwise receivers can