diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py
--- a/rhodecode/lib/db_manage.py
+++ b/rhodecode/lib/db_manage.py
@@ -170,6 +170,7 @@ class DbManage(object):
 
             def step_4(self):
                 print ('TODO:')
+                raise NotImplementedError()
 
         upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
 
diff --git a/rhodecode/lib/rcmail/message.py b/rhodecode/lib/rcmail/message.py
--- a/rhodecode/lib/rcmail/message.py
+++ b/rhodecode/lib/rcmail/message.py
@@ -99,9 +99,6 @@ class Message(object):
                                 Html=self.html,
                                 separator=self.recipients_separator)
 
-        if self.bcc:
-            response.base['Bcc'] = self.bcc
-
         if self.cc:
             response.base['Cc'] = self.cc