diff --git a/webapp/src/main/java/i2p/bote/imap/BoteMailbox.java b/webapp/src/main/java/i2p/bote/imap/BoteMailbox.java
index b25fe652..63b5be9f 100644
--- a/webapp/src/main/java/i2p/bote/imap/BoteMailbox.java
+++ b/webapp/src/main/java/i2p/bote/imap/BoteMailbox.java
@@ -24,6 +24,7 @@
 import com.google.common.base.Optional;
 
 import org.apache.james.mailbox.MessageUid;
+import org.apache.james.mailbox.model.MailboxConstants;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.store.mail.model.MailboxMessage;
@@ -69,7 +70,7 @@ public class BoteMailbox extends SimpleMailbox {
     private FolderListener folderListener;
 
     public BoteMailbox(EmailFolder folder, long uidValidity, MessageUid nextUid) {
-        super(new MailboxPath("I2P-Bote", "bote", folder.getName()), uidValidity,
+        super(new MailboxPath(MailboxConstants.USER_NAMESPACE, "bote", folder.getName()), uidValidity,
                 new BoteMailboxId(folder.getName()));
         this.folder = folder;
         this.messageMap = Collections.synchronizedSortedMap(new TreeMap<Email, BoteMessage>(new Comparator<Email>() {
@@ -106,7 +107,6 @@ public int compare(Email email1, Email email2) {
         nextModSeqLock.writeLock().lock();
         try {
             nextModSeq = System.currentTimeMillis();
-            nextModSeq <<= 32;
         } finally {
             nextModSeqLock.writeLock().unlock();
         }
diff --git a/webapp/src/main/java/i2p/bote/imap/MapperFactory.java b/webapp/src/main/java/i2p/bote/imap/MapperFactory.java
index b277c091..e9bbb3ca 100644
--- a/webapp/src/main/java/i2p/bote/imap/MapperFactory.java
+++ b/webapp/src/main/java/i2p/bote/imap/MapperFactory.java
@@ -84,7 +84,6 @@ class MapperFactory extends MailboxSessionMapperFactory {
         this.folderManager = folderManager;
         mailboxes = new HashMap<>();
         uidValidity = System.currentTimeMillis();
-        uidValidity <<= 32;
         uidProvider = createUidProvider();
         modSeqProvider = createModSeqProvider();
     }