3 files changed, 6 insertions, 2 deletions
diff --git a/addons/mass_mailing_sms/models/mailing_mailing.py b/addons/mass_mailing_sms/models/mailing_mailing.py
index 374fac93c77..88de914331a 100644
--- a/addons/mass_mailing_sms/models/mailing_mailing.py
+++ b/addons/mass_mailing_sms/models/mailing_mailing.py
@@ -165,7 +165,7 @@ class Mailing(models.Model):
             # options
             'composition_mode': 'mass',
             'mailing_id': self.id,
-            'mass_keep_log': False,
+            'mass_keep_log': self.keep_archives,
             'mass_sms_allow_unsubscribe': self.sms_allow_unsubscribe,
         }
 
diff --git a/addons/mass_mailing_sms/models/mailing_trace.py b/addons/mass_mailing_sms/models/mailing_trace.py
index 56bb84b0eff..f9d22f823e4 100644
--- a/addons/mass_mailing_sms/models/mailing_trace.py
+++ b/addons/mass_mailing_sms/models/mailing_trace.py
@@ -59,6 +59,10 @@ class MailingTrace(models.Model):
             domain = expression.AND([domain, additional_domain])
         return self.search(domain)
 
+    def set_failed(self, failure_type):
+        for trace in self:
+            trace.write({'exception': fields.Datetime.now(), 'failure_type': failure_type})
+
     def set_sms_sent(self, sms_sms_ids=None):
         statistics = self._get_records_from_sms(sms_sms_ids, [('sent', '=', False)])
         statistics.write({'sent': fields.Datetime.now()})
diff --git a/addons/mass_mailing_sms/models/sms_sms.py b/addons/mass_mailing_sms/models/sms_sms.py
index 2167faa46ef..8b17ed28814 100644
--- a/addons/mass_mailing_sms/models/sms_sms.py
+++ b/addons/mass_mailing_sms/models/sms_sms.py
@@ -43,5 +43,5 @@ class SmsSms(models.Model):
                 if traces and state == 'success':
                     traces.write({'sent': fields.Datetime.now(), 'exception': False})
                 elif traces:
-                    traces.write({'exception': fields.Datetime.now(), 'failure_type': self.IAP_TO_SMS_STATE[state]})
+                    traces.set_failed(failure_type=self.IAP_TO_SMS_STATE[state])
         return super(SmsSms, self)._postprocess_iap_sent_sms(iap_results, failure_reason=failure_reason, delete_all=delete_all)