diff --git a/internal/store/address.go b/internal/store/address.go
index 87727526..cb32c3f3 100644
--- a/internal/store/address.go
+++ b/internal/store/address.go
@@ -20,6 +20,7 @@ package store
 import (
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/sirupsen/logrus"
+	bolt "go.etcd.io/bbolt"
 )
 
 // Address holds mailboxes for IMAP user (login address). In combined mode
@@ -63,20 +64,23 @@ func (storeAddress *Address) init(foldersAndLabels []*pmapi.Label) (err error) {
 
 	storeAddress.mailboxes = make(map[string]*Mailbox)
 
-	for _, label := range foldersAndLabels {
-		prefix := getLabelPrefix(label)
+	err = storeAddress.store.db.Update(func(tx *bolt.Tx) error {
+		for _, label := range foldersAndLabels {
+			prefix := getLabelPrefix(label)
 
-		var mailbox *Mailbox
-		if mailbox, err = newMailbox(storeAddress, label.ID, prefix, label.Name, label.Color); err != nil {
-			storeAddress.log.
-				WithError(err).
-				WithField("labelID", label.ID).
-				Error("Could not init mailbox for folder or label")
-			return
+			var mailbox *Mailbox
+			if mailbox, err = txNewMailbox(tx, storeAddress, label.ID, prefix, label.Name, label.Color); err != nil {
+				storeAddress.log.
+					WithError(err).
+					WithField("labelID", label.ID).
+					Error("Could not init mailbox for folder or label")
+				return err
+			}
+
+			storeAddress.mailboxes[label.ID] = mailbox
 		}
-
-		storeAddress.mailboxes[label.ID] = mailbox
-	}
+		return nil
+	})
 
 	return
 }
diff --git a/internal/store/mailbox.go b/internal/store/mailbox.go
index 420792c9..b8589b49 100644
--- a/internal/store/mailbox.go
+++ b/internal/store/mailbox.go
@@ -41,10 +41,16 @@ type Mailbox struct {
 }
 
 func newMailbox(storeAddress *Address, labelID, labelPrefix, labelName, color string) (mb *Mailbox, err error) {
-	l := log.
-		WithField("addrID", storeAddress.addressID).
-		WithField("lblID", labelID)
-	mb = &Mailbox{
+	_ = storeAddress.store.db.Update(func(tx *bolt.Tx) error {
+		mb, err = txNewMailbox(tx, storeAddress, labelID, labelPrefix, labelName, color)
+		return err
+	})
+	return
+}
+
+func txNewMailbox(tx *bolt.Tx, storeAddress *Address, labelID, labelPrefix, labelName, color string) (*Mailbox, error) {
+	l := log.WithField("addrID", storeAddress.addressID).WithField("labelID", labelID)
+	mb := &Mailbox{
 		store:        storeAddress.store,
 		storeAddress: storeAddress,
 		labelID:      labelID,
@@ -54,18 +60,17 @@ func newMailbox(storeAddress *Address, labelID, labelPrefix, labelName, color st
 		log:          l,
 	}
 
-	if err = mb.store.db.Update(func(tx *bolt.Tx) error {
-		return initMailboxBucket(tx, mb.getBucketName())
-	}); err != nil {
+	err := initMailboxBucket(tx, mb.getBucketName())
+	if err != nil {
 		l.WithError(err).Error("Could not initialise mailbox buckets")
 	}
 
-	syncDraftsIfNecssary(mb)
+	syncDraftsIfNecssary(tx, mb)
 
-	return
+	return mb, err
 }
 
-func syncDraftsIfNecssary(mb *Mailbox) { //nolint[funlen]
+func syncDraftsIfNecssary(tx *bolt.Tx, mb *Mailbox) { //nolint[funlen]
 	// We didn't support drafts before v1.2.6 and therefore if we now created
 	// Drafts mailbox we need to check whether counts match (drafts are synced).
 	// If not, sync them from local metadata without need to do full resync,
@@ -76,12 +81,12 @@ func syncDraftsIfNecssary(mb *Mailbox) { //nolint[funlen]
 
 	// If the drafts mailbox total is non-zero, it means it has already been used
 	// and there is no need to continue. Otherwise, we may need to do an initial sync.
-	total, _, err := mb.GetCounts()
+	total, _, err := mb.txGetCounts(tx)
 	if err != nil || total != 0 {
 		return
 	}
 
-	counts, err := mb.store.getOnAPICounts()
+	counts, err := mb.store.txGetOnAPICounts(tx)
 	if err != nil {
 		return
 	}
@@ -107,21 +112,19 @@ func syncDraftsIfNecssary(mb *Mailbox) { //nolint[funlen]
 	}
 
 	if !foundCounts || doSync {
-		err := mb.store.db.Update(func(tx *bolt.Tx) error {
-			return tx.Bucket(metadataBucket).ForEach(func(k, v []byte) error {
-				msg := &pmapi.Message{}
-				if err := json.Unmarshal(v, msg); err != nil {
-					return err
+		err := tx.Bucket(metadataBucket).ForEach(func(k, v []byte) error {
+			msg := &pmapi.Message{}
+			if err := json.Unmarshal(v, msg); err != nil {
+				return err
+			}
+			for _, msgLabelID := range msg.LabelIDs {
+				if msgLabelID == pmapi.DraftLabel {
+					log.WithField("id", msg.ID).Trace("Drafts mailbox created: syncing draft locally")
+					_ = mb.txCreateOrUpdateMessages(tx, []*pmapi.Message{msg})
+					break
 				}
-				for _, msgLabelID := range msg.LabelIDs {
-					if msgLabelID == pmapi.DraftLabel {
-						log.WithField("id", msg.ID).Trace("Drafts mailbox created: syncing draft locally")
-						_ = mb.txCreateOrUpdateMessages(tx, []*pmapi.Message{msg})
-						break
-					}
-				}
-				return nil
-			})
+			}
+			return nil
 		})
 		log.WithError(err).Info("Drafts mailbox created: synced localy")
 	}
diff --git a/internal/store/mailbox_counts.go b/internal/store/mailbox_counts.go
index 03e4d046..21bef9a7 100644
--- a/internal/store/mailbox_counts.go
+++ b/internal/store/mailbox_counts.go
@@ -185,31 +185,34 @@ func (store *Store) getLabelsFromLocalStorage() ([]*pmapi.Label, error) {
 	return labels, nil
 }
 
-func (store *Store) getOnAPICounts() ([]*mailboxCounts, error) {
+func (store *Store) getOnAPICounts() (counts []*mailboxCounts, err error) {
+	err = store.db.View(func(tx *bolt.Tx) error {
+		counts, err = store.txGetOnAPICounts(tx)
+		return err
+	})
+	return
+}
+
+func (store *Store) txGetOnAPICounts(tx *bolt.Tx) ([]*mailboxCounts, error) {
 	counts := []*mailboxCounts{}
-	tx := func(tx *bolt.Tx) error {
-		c := tx.Bucket(countsBucket).Cursor()
-		for k, countsB := c.First(); k != nil; k, countsB = c.Next() {
-			l := store.log.WithField("key", string(k))
-			if countsB == nil {
-				err := errors.New("empty counts in DB")
-				l.WithError(err).Error("While getting local labels")
-				return err
-			}
-
-			mbCounts := &mailboxCounts{}
-			if err := json.Unmarshal(countsB, mbCounts); err != nil {
-				l.WithError(err).Error("While unmarshaling local labels")
-				return err
-			}
-
-			counts = append(counts, mbCounts)
+	c := tx.Bucket(countsBucket).Cursor()
+	for k, countsB := c.First(); k != nil; k, countsB = c.Next() {
+		l := store.log.WithField("key", string(k))
+		if countsB == nil {
+			err := errors.New("empty counts in DB")
+			l.WithError(err).Error("While getting local labels")
+			return nil, err
 		}
-		return nil
-	}
-	err := store.db.View(tx)
 
-	return counts, err
+		mbCounts := &mailboxCounts{}
+		if err := json.Unmarshal(countsB, mbCounts); err != nil {
+			l.WithError(err).Error("While unmarshaling local labels")
+			return nil, err
+		}
+
+		counts = append(counts, mbCounts)
+	}
+	return counts, nil
 }
 
 // createOrUpdateOnAPICounts will change only on-API-counts.