diff options
Diffstat (limited to 'src/acit/imapplugin.py')
| -rw-r--r-- | src/acit/imapplugin.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/acit/imapplugin.py b/src/acit/imapplugin.py index a095178..5598fa8 100644 --- a/src/acit/imapplugin.py +++ b/src/acit/imapplugin.py @@ -149,6 +149,9 @@ class ImapPlugin(plugins.SimplePlugin): email=email.replace("None#","#") email=email.replace("#None",'') email=email.replace("+None",'') + if email.startswith("@"): + email=self.imap_user + if subject: email+='?subject=' email+=quote(subject, safe='') @@ -384,7 +387,7 @@ class ImapPlugin(plugins.SimplePlugin): self.move_errored_mail(mailbox,msg) else: # try again later, maybe we need to index first or handle some other email first - mailbox.flag([msg.uid],"RETRYING") + mailbox.flag([msg.uid],"RETRYING",value=True) self.mlog("Message-ID not in index, trying again next round") return # end block @@ -508,7 +511,7 @@ class ImapPlugin(plugins.SimplePlugin): body+="\n\nIf you think this is a bug, please report it (mail to acit@bugs.vosjedev.net).\n" body+="Make sure to attach both this email and the email that triggered this bug." - self.smtp.sendmail(replyto=msg,from_=from_,body=body) + self.smtp.sendmail(replyto=msg,from_=from_,body=body,save=False) def move_errored_mail(self,mailbox:MailBox,msg:MailMessage,): target=self.ensurefolder(mailbox,"INBOX","Errors") |