Index: email2trac.py.in
===================================================================
--- email2trac.py.in	(revision 632)
+++ email2trac.py.in	(working copy)
@@ -227,6 +227,8 @@
         self.trac_smtp_from = self.get_config('notification', 'smtp_from')
         self.smtp_default_domain = self.get_config('notification', 'smtp_default_domain')
         self.smtp_replyto = self.get_config('notification', 'smtp_replyto')
+        self.trac_smtp_always_cc = self.get_config('notification', 'smtp_always_cc')
+        self.trac_smtp_always_bcc = self.get_config('notification', 'smtp_always_bcc')
 
 
         self.system = None
@@ -422,6 +424,7 @@
 
             if update:
                 self.logger.debug("\tupdate cc-fields")
+                email_cc = ticket['cc']
 
             for name,addr in cc_addrs:
         
@@ -437,7 +440,26 @@
                     self.logger.debug("\tSkipping reporter email address for CC-field")
                     continue
 
+                ## Always remove the always_cc address
+                #
+                elif addr == self.trac_smtp_always_cc:
+                    self.logger.debug("\tSkipping smtp_always_cc email address for CC-field")
+                    continue
+
+                ## Always remove the always_bcc address
+                #
+                elif addr == self.trac_smtp_always_bcc:
+                    self.logger.debug("\tSkipping smtp_always_bcc email address for CC-field")
+                    continue
+
                 else:
+                    ## On update, prevent adding duplicates
+                    #
+                    if update:
+                      cc_list = email_cc.split(',')
+                      if addr in cc_list:
+                          continue
+                    
                     if email_cc:
                         email_cc = '%s, %s' %(email_cc, addr)
                     else: