summaryrefslogtreecommitdiff
path: root/service/pixelated/adapter
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated/adapter')
-rw-r--r--service/pixelated/adapter/pixelated_mail.py3
-rw-r--r--service/pixelated/adapter/pixelated_mailbox.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/service/pixelated/adapter/pixelated_mail.py b/service/pixelated/adapter/pixelated_mail.py
index e8aab1eb..d39cf81e 100644
--- a/service/pixelated/adapter/pixelated_mail.py
+++ b/service/pixelated/adapter/pixelated_mail.py
@@ -14,6 +14,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
from pixelated.adapter.status import Status
+from pixelated.support.id_gen import gen_pixelated_uid
import pixelated.support.date
import dateutil.parser as dateparser
from email.MIMEMultipart import MIMEMultipart
@@ -32,7 +33,7 @@ class PixelatedMail:
mail.body = leap_mail.bdoc.content['raw']
mail.headers = mail._extract_headers()
mail.date = PixelatedMail._get_date(mail.headers)
- mail.ident = leap_mail.getUID()
+ mail.ident = gen_pixelated_uid(leap_mail._mbox, leap_mail.getUID())
mail.status = set(mail._extract_status())
mail.security_casing = {}
mail.tags = mail._extract_tags()
diff --git a/service/pixelated/adapter/pixelated_mailbox.py b/service/pixelated/adapter/pixelated_mailbox.py
index 1a17926a..6323d3c3 100644
--- a/service/pixelated/adapter/pixelated_mailbox.py
+++ b/service/pixelated/adapter/pixelated_mailbox.py
@@ -19,6 +19,7 @@ import os
from pixelated.adapter.pixelated_mail import PixelatedMail
from pixelated.adapter.tag import Tag
from pixelated.adapter.tag_index import TagIndex
+from pixelated.support.id_gen import gen_pixelated_uid
class PixelatedMailbox:
@@ -59,7 +60,7 @@ class PixelatedMailbox:
def mail(self, mail_id):
for message in self.leap_mailbox.messages:
- if message.getUID() == int(mail_id):
+ if gen_pixelated_uid(self.leap_mailbox.mbox, message.getUID()) == mail_id:
return PixelatedMail.from_leap_mail(message)
def all_tags(self):