From 21e1051ae2141348f56184531b5382f5d9c3d7ba Mon Sep 17 00:00:00 2001
From: erikaperugachi <erikaperugachi@gmail.com>
Date: Fri, 21 Sep 2018 10:00:37 -0500
Subject: [PATCH] Fix badge. Fix #424

---
 electron_app/src/windows/composer.js          |   8 +-
 email_mailbox/src/actions/emails.js           |  15 --
 email_mailbox/src/actions/index.js            |   4 +-
 email_mailbox/src/actions/labels.js           | 131 +++++++---
 email_mailbox/src/actions/threads.js          |  50 +++-
 email_mailbox/src/actions/types.js            |   5 +-
 email_mailbox/src/components/LabelEdit.js     |   5 -
 email_mailbox/src/components/PanelWrapper.js  |  27 +-
 email_mailbox/src/components/Thread.js        |  13 +-
 .../src/containers/HeaderThreadOptions.js     |  22 +-
 email_mailbox/src/containers/LabelEdit.js     |  27 +-
 email_mailbox/src/containers/Panel.js         |  37 ++-
 email_mailbox/src/containers/Settings.js      |  27 +-
 email_mailbox/src/containers/Thread.js        |  23 +-
 email_mailbox/src/containers/ThreadItem.js    |   3 +-
 email_mailbox/src/data/message.js             |   4 +
 .../__tests__/__snapshots__/labels.js.snap    |  68 +----
 .../src/reducers/__tests__/labels.js          | 233 +++++++-----------
 email_mailbox/src/reducers/labels.js          |  64 +++--
 .../src/utils/electronEventInterface.js       |  74 +++---
 20 files changed, 405 insertions(+), 435 deletions(-)

diff --git a/electron_app/src/windows/composer.js b/electron_app/src/windows/composer.js
index e59456635..91d330830 100644
--- a/electron_app/src/windows/composer.js
+++ b/electron_app/src/windows/composer.js
@@ -146,7 +146,7 @@ const destroy = async ({ composerId, emailId }) => {
         oldDraftEmail.id,
         undefined
       );
-      sendEventToMailbox('update-drafts', { operation: 'less', value: 1 });
+      sendEventToMailbox('update-drafts', true);
     } else if (
       type === composerEvents.REPLY ||
       type === composerEvents.REPLY_ALL
@@ -175,10 +175,10 @@ const sendEventToMailbox = (eventName, data) => {
 const saveDraftToDatabase = async (composerId, dataDraft) => {
   const emailToEdit = globalManager.emailToEdit.get(composerId);
   const { type, key } = emailToEdit || {};
-  let badgeOperation = {};
+  let shouldUpdateBadge = false;
   if ((!type && !key) || type !== composerEvents.EDIT_DRAFT) {
     await dbManager.createEmail(dataDraft);
-    badgeOperation = { operation: 'add', value: 1 };
+    shouldUpdateBadge = true;
   } else {
     const [oldEmail] = await dbManager.getEmailByKey(key);
     const newEmailId = await dbManager.deleteEmailLabelAndContactByEmailId(
@@ -195,7 +195,7 @@ const saveDraftToDatabase = async (composerId, dataDraft) => {
       return;
     }
   }
-  sendEventToMailbox('update-drafts', badgeOperation);
+  sendEventToMailbox('update-drafts', shouldUpdateBadge);
 };
 
 module.exports = {
diff --git a/email_mailbox/src/actions/emails.js b/email_mailbox/src/actions/emails.js
index 14809e12a..8c51f7eec 100644
--- a/email_mailbox/src/actions/emails.js
+++ b/email_mailbox/src/actions/emails.js
@@ -2,7 +2,6 @@ import { Email } from './types';
 import {
   getContactByIds,
   getEmailsByThreadId,
-  updateUnreadEmailByThreadIds,
   setMuteEmailById,
   setUnreadEmailById,
   updateEmail,
@@ -12,7 +11,6 @@ import {
 } from '../utils/electronInterface';
 import { EmailUtils } from '../utils/electronUtilsInterface';
 import { loadContacts } from './contacts';
-import { updateLabelSuccess } from './labels';
 import { EmailStatus, SocketCommand } from '../utils/const';
 import { unsendEmailFiles } from './files';
 import {
@@ -139,19 +137,6 @@ export const removeEmailsOnSuccess = emailIds => ({
   emailIds
 });
 
-export const updateUnreadEmails = (thread, label) => {
-  return async dispatch => {
-    try {
-      await updateUnreadEmailByThreadIds([thread.id], thread.unread);
-      if (label) {
-        dispatch(updateLabelSuccess(label));
-      }
-    } catch (e) {
-      // To do
-    }
-  };
-};
-
 export const unsendEmail = params => {
   return async dispatch => {
     const { key, emailId, contactIds, unsendDate } = params;
diff --git a/email_mailbox/src/actions/index.js b/email_mailbox/src/actions/index.js
index 50fa8fb74..6dc0285d6 100644
--- a/email_mailbox/src/actions/index.js
+++ b/email_mailbox/src/actions/index.js
@@ -36,7 +36,6 @@ import {
   muteNotifications,
   removeEmails,
   removeEmailsOnSuccess,
-  updateUnreadEmails,
   unsendEmail,
   unsendEmailOnSuccess,
   updateEmailLabels
@@ -47,6 +46,7 @@ import {
   loadLabels,
   removeLabel,
   removeLabelOnSuccess,
+  updateBadgeLabels,
   updateLabel,
   updateLabelSuccess
 } from './labels';
@@ -111,13 +111,13 @@ export {
   unsendEmailFiles,
   unsendEmailOnSuccess,
   updateAllFeedItemsAsOlder,
+  updateBadgeLabels,
   updateFeedItemSuccess,
   updateEmailIdsThread,
   updateEmailLabels,
   updateLabel,
   updateLabelSuccess,
   updateStatusThread,
-  updateUnreadEmails,
   updateUnreadThreads,
   updateUnreadThreadsSuccess
 };
diff --git a/email_mailbox/src/actions/labels.js b/email_mailbox/src/actions/labels.js
index 1a00677ff..5896501a7 100644
--- a/email_mailbox/src/actions/labels.js
+++ b/email_mailbox/src/actions/labels.js
@@ -9,28 +9,14 @@ import {
   updateLabel as updateLabelDB,
   deleteLabelById
 } from '../utils/electronInterface';
+import { sendUpdateLabelsErrorMessage } from './../utils/electronEventInterface';
 import { SocketCommand } from '../utils/const';
 
-export const addLabels = labels => {
-  return {
-    type: Label.ADD_BATCH,
-    labels: labels
-  };
-};
-
-export const updateLabelSuccess = label => {
-  return {
-    type: Label.UPDATE_SUCCESS,
-    label: label
-  };
-};
-
-export const addLabel = (label, isByEvent) => {
+export const addLabel = label => {
   return async dispatch => {
     try {
-      const [response] = await createLabel(label);
-      if (response) {
-        const labelId = response;
+      const [labelId] = await createLabel(label);
+      if (labelId) {
         const { text, color, visible } = label;
         const labels = {
           [labelId]: {
@@ -41,23 +27,26 @@ export const addLabel = (label, isByEvent) => {
             visible
           }
         };
-        if (isByEvent) {
-          dispatch(addLabels(labels));
-        } else {
-          const eventParams = {
-            cmd: SocketCommand.PEER_LABEL_CREATED,
-            params: { color, text }
-          };
-          await postPeerEvent(eventParams);
-          dispatch(addLabels(labels));
-        }
+        const eventParams = {
+          cmd: SocketCommand.PEER_LABEL_CREATED,
+          params: { color: color.replace('#', ''), text }
+        };
+        await postPeerEvent(eventParams);
+        dispatch(addLabels(labels));
       }
     } catch (e) {
-      //TO DO
+      sendUpdateLabelsErrorMessage();
     }
   };
 };
 
+export const addLabels = labels => {
+  return {
+    type: Label.ADD_BATCH,
+    labels
+  };
+};
+
 export const loadLabels = () => {
   return async dispatch => {
     try {
@@ -85,11 +74,31 @@ export const loadLabels = () => {
       labels[LabelType.draft.id].badge = badgeDraft[0].count;
       dispatch(addLabels(labels));
     } catch (e) {
-      // TO DO
+      sendUpdateLabelsErrorMessage();
     }
   };
 };
 
+export const removeLabel = id => {
+  return async dispatch => {
+    try {
+      const response = await deleteLabelById(id);
+      if (response) {
+        dispatch(removeLabelOnSuccess(id));
+      }
+    } catch (e) {
+      sendUpdateLabelsErrorMessage();
+    }
+  };
+};
+
+export const removeLabelOnSuccess = labelId => {
+  return {
+    type: Label.REMOVE,
+    labelId
+  };
+};
+
 export const updateLabel = ({ id, color, text, visible }) => {
   return async dispatch => {
     try {
@@ -98,27 +107,69 @@ export const updateLabel = ({ id, color, text, visible }) => {
         dispatch(updateLabelSuccess({ id, color, text, visible }));
       }
     } catch (e) {
-      // TO DO
+      sendUpdateLabelsErrorMessage();
     }
   };
 };
 
-export const removeLabel = id => {
+export const updateBadgeLabels = labelIds => {
   return async dispatch => {
+    if (!labelIds.length) return;
     try {
-      const response = await deleteLabelById(id);
-      if (response) {
-        dispatch(removeLabelOnSuccess(id));
-      }
+      const labelsFiltered = labelIds.filter(labelId => {
+        return (
+          labelId === LabelType.inbox.id ||
+          labelId === LabelType.spam.id ||
+          labelId === LabelType.draft.id
+        );
+      });
+      const labels = await Promise.all(
+        labelsFiltered.map(async labelId => {
+          if (labelId === LabelType.inbox.id) {
+            const rejectedLabelIds = [LabelType.spam.id, LabelType.trash.id];
+            const unreadInbox = await getEmailsUnredByLabelId({
+              labelId,
+              rejectedLabelIds
+            });
+            const badgeInbox = unreadInbox.length;
+            return {
+              id: String(labelId),
+              badge: badgeInbox
+            };
+          } else if (labelId === LabelType.spam.id) {
+            const unreadSpam = await getEmailsUnredByLabelId({
+              labelId
+            });
+            const badgeSpam = unreadSpam.length;
+            return {
+              id: String(labelId),
+              badge: badgeSpam
+            };
+          } else if (labelId === LabelType.draft.id) {
+            const badgeDraft = await getEmailsCounterByLabelId(labelId);
+            return {
+              id: String(labelId),
+              badge: badgeDraft[0].count
+            };
+          }
+        })
+      );
+      dispatch(updateBadgeLabelsSuccess(labels));
     } catch (e) {
-      // TO DO
+      sendUpdateLabelsErrorMessage();
     }
   };
 };
+export const updateBadgeLabelsSuccess = labelIds => {
+  return {
+    type: Label.UPDATE_BADGE_LABELS,
+    labelIds
+  };
+};
 
-export const removeLabelOnSuccess = labelId => {
+export const updateLabelSuccess = label => {
   return {
-    type: Label.REMOVE_SUCCESS,
-    labelId
+    type: Label.UPDATE,
+    label
   };
 };
diff --git a/email_mailbox/src/actions/threads.js b/email_mailbox/src/actions/threads.js
index 8ef217734..507d47306 100644
--- a/email_mailbox/src/actions/threads.js
+++ b/email_mailbox/src/actions/threads.js
@@ -1,6 +1,6 @@
 import { Thread } from './types';
 import { startLoadSync, stopLoadSync } from './activity';
-import { updateLabelSuccess } from './labels';
+import { updateBadgeLabels } from './labels';
 import {
   createEmailLabel,
   deleteEmailLabel,
@@ -10,6 +10,7 @@ import {
   getEmailsGroupByThreadByParams,
   getLabelById,
   getTrashExpiredEmails,
+  LabelType,
   postOpenEvent,
   postPeerEvent,
   updateEmails,
@@ -137,6 +138,7 @@ export const addMoveLabelIdThreads = ({
   threadsParams,
   labelIdToAdd,
   labelIdToRemove,
+  currentLabelId,
   notMove
 }) => {
   return async dispatch => {
@@ -144,9 +146,12 @@ export const addMoveLabelIdThreads = ({
       const threadIds = threadsParams
         .map(param => param.threadIdDB)
         .filter(item => item !== null);
-      const [label] = await getLabelById(labelIdToAdd);
-      const labelsAdded = [label.text];
-      const labelsRemoved = labelIdToRemove ? [labelIdToRemove] : [];
+      const [labeltoAdd] = await getLabelById(labelIdToAdd);
+      const labelsAdded = [labeltoAdd.text];
+      const [labeltoRemove] = labelIdToRemove
+        ? await getLabelById(labelIdToRemove)
+        : [undefined];
+      const labelsRemoved = labeltoRemove ? [labeltoRemove.text] : [];
       const eventParams = {
         cmd: SocketCommand.PEER_THREAD_LABELS_UPDATE,
         params: {
@@ -174,8 +179,20 @@ export const addMoveLabelIdThreads = ({
             return await createEmailLabel(paramsToAdd);
           })
         );
-        if (dbReponse && !notMove) {
-          dispatch(moveThreads(threadIds, labelIdToAdd));
+        if (dbReponse) {
+          let labelIds = [];
+          if (
+            currentLabelId === LabelType.inbox.id &&
+            (labelIdToAdd === LabelType.trash.id ||
+              labelIdToAdd === LabelType.spam.id)
+          )
+            labelIds = [...labelIds, currentLabelId];
+          if (labelIdToAdd === LabelType.spam.id)
+            labelIds = [...labelIds, labelIdToAdd];
+          if (labelIds.length) dispatch(updateBadgeLabels(labelIds));
+          if (!notMove) {
+            dispatch(moveThreads(threadIds, labelIdToAdd));
+          }
         }
       } else {
         sendUpdateThreadLabelsErrorMessage();
@@ -280,6 +297,9 @@ export const removeLabelIdThreads = (threadsParams, labelId) => {
         );
         if (dbReponse) {
           dispatch(removeLabelIdThreadsSuccess(threadIds, labelId));
+          let labelIds = [LabelType.inbox.id];
+          if (labelId === LabelType.spam.id) labelIds = [...labelIds, labelId];
+          dispatch(updateBadgeLabels(labelIds));
         }
       } else {
         sendUpdateThreadLabelsErrorMessage();
@@ -296,7 +316,7 @@ export const removeLabelIdThreadsSuccess = (threadIds, labelId) => ({
   labelId
 });
 
-export const removeThreads = threadsParams => {
+export const removeThreads = (threadsParams, labelId) => {
   return async dispatch => {
     try {
       const emailIds = threadsParams
@@ -322,6 +342,9 @@ export const removeThreads = threadsParams => {
         await deleteEmailsByIds(emailIds);
         dispatch(removeThreadsSuccess(emailIds));
       }
+      if (labelId === LabelType.spam.id) {
+        dispatch(updateBadgeLabels([labelId]));
+      }
       dispatch(loadFeedItems(true));
     } catch (e) {
       sendRemoveThreadsErrorMessage();
@@ -357,7 +380,7 @@ export const updateUnreadThreadsSuccess = (threadIds, unread) => ({
   type: Thread.UPDATE_UNREAD_THREADS
 });
 
-export const updateUnreadThreads = (threadsParams, unread, label) => {
+export const updateUnreadThreads = (threadsParams, unread, labelId) => {
   return async dispatch => {
     try {
       const threadIds = threadsParams.map(param => param.threadIdDB);
@@ -370,7 +393,8 @@ export const updateUnreadThreads = (threadsParams, unread, label) => {
         const response = await updateUnreadEmailByThreadIds(threadIds, unread);
         if (response) {
           dispatch(updateUnreadThreadsSuccess(threadIds, unread));
-          if (label) dispatch(updateLabelSuccess(label));
+          if (labelId === LabelType.inbox.id || labelId === LabelType.spam.id)
+            dispatch(updateBadgeLabels([labelId]));
         }
       }
     } catch (e) {
@@ -417,7 +441,12 @@ export const loadEvents = () => {
   };
 };
 
-export const sendOpenEvent = (emailKeysUnread, myEmailKeysUnread, threadId) => {
+export const sendOpenEvent = (
+  emailKeysUnread,
+  myEmailKeysUnread,
+  threadId,
+  labelId
+) => {
   return async dispatch => {
     try {
       let postSuccess = true;
@@ -449,6 +478,7 @@ export const sendOpenEvent = (emailKeysUnread, myEmailKeysUnread, threadId) => {
           }
         }
       }
+      dispatch(updateBadgeLabels([labelId]));
     } catch (e) {
       sendOpenEventErrorMessage();
     }
diff --git a/email_mailbox/src/actions/types.js b/email_mailbox/src/actions/types.js
index ff640e72e..571a949e0 100644
--- a/email_mailbox/src/actions/types.js
+++ b/email_mailbox/src/actions/types.js
@@ -37,8 +37,9 @@ export const Email = {
 
 export const Label = {
   ADD_BATCH: 'ADD_LABELS',
-  UPDATE_SUCCESS: 'UPDATE_LABEL_SUCCESS',
-  REMOVE_SUCCESS: 'REMOVE_LABEL_SUCCESS'
+  UPDATE: 'UPDATE_LABEL',
+  UPDATE_BADGE_LABELS: 'UPDATE_BADGE_LABELS',
+  REMOVE: 'REMOVE_LABEL'
 };
 
 export const FeedItem = {
diff --git a/email_mailbox/src/components/LabelEdit.js b/email_mailbox/src/components/LabelEdit.js
index 30d83207f..e85739459 100644
--- a/email_mailbox/src/components/LabelEdit.js
+++ b/email_mailbox/src/components/LabelEdit.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { addEvent, Event } from '../utils/electronEventInterface';
 import './labeledit.css';
 
 class LabelEdit extends Component {
@@ -10,10 +9,6 @@ class LabelEdit extends Component {
       addLabel: false,
       labelToAdd: ''
     };
-
-    addEvent(Event.LABEL_CREATED, params => {
-      this.props.onAddLabel(null, params);
-    });
   }
 
   render() {
diff --git a/email_mailbox/src/components/PanelWrapper.js b/email_mailbox/src/components/PanelWrapper.js
index b0aea4a26..66628acfa 100644
--- a/email_mailbox/src/components/PanelWrapper.js
+++ b/email_mailbox/src/components/PanelWrapper.js
@@ -144,13 +144,13 @@ class PanelWrapper extends Component {
 
   initEventHandlers = props => {
     addEvent(Event.NEW_EMAIL, emailParams => {
-      const { emailId, isToMe, labels, threadId } = emailParams;
+      const { emailId, labels, threadId } = emailParams;
       const currentSectionType = this.state.sectionSelected.type;
       const isRenderingMailbox = currentSectionType === SectionType.MAILBOX;
       const isRenderingThread = currentSectionType === SectionType.THREAD;
       const currentLabelId =
         LabelType[this.state.sectionSelected.params.mailboxSelected].id;
-      const isNewEmailInMailbox = labels.indexOf(currentLabelId) > -1;
+      const isNewEmailInMailbox = labels.includes(currentLabelId);
       const currentThreadId = this.state.sectionSelected.params
         .threadIdSelected;
       if (isRenderingMailbox && isNewEmailInMailbox) {
@@ -165,13 +165,7 @@ class PanelWrapper extends Component {
           emailIdToAdd: emailId
         });
       }
-      if (isToMe) {
-        props.onUpdateUnreadEmailsBadge({
-          labelId: LabelType.inbox.id,
-          operation: 'add',
-          value: 1
-        });
-      }
+      props.onUpdateUnreadEmailsBadge(labels);
     });
 
     addEvent(Event.REFRESH_THREADS, eventParams => {
@@ -187,8 +181,8 @@ class PanelWrapper extends Component {
         props.onLoadEmails(this.state.sectionSelected.params.threadIdSelected);
       }
       if (eventParams) {
-        const { labelId, operation, value } = eventParams;
-        props.onUpdateUnreadEmailsBadge({ labelId, operation, value });
+        const { labelIds } = eventParams;
+        props.onUpdateUnreadEmailsBadge(labelIds);
       }
     });
 
@@ -227,11 +221,7 @@ class PanelWrapper extends Component {
         emailIdsToRemove: [oldEmailId]
       });
       if (!newEmailId && !oldEmailId) {
-        props.onUpdateUnreadEmailsBadge({
-          labelId: LabelType.inbox.id,
-          operation: 'add',
-          value: 1
-        });
+        props.onUpdateUnreadEmailsBadge([LabelType.inbox.id]);
       }
     });
 
@@ -271,10 +261,15 @@ class PanelWrapper extends Component {
         mailboxPopupType: MAILBOX_POPUP_TYPES.PASSWORD_CHANGED
       });
     });
+
+    addEvent(Event.LABEL_CREATED, labels => {
+      this.props.onAddLabels(labels);
+    });
   };
 }
 
 PanelWrapper.propTypes = {
+  onAddLabels: PropTypes.func,
   onLoadEmails: PropTypes.func,
   onMarkThreadAsOpen: PropTypes.func,
   onLoadThreads: PropTypes.func,
diff --git a/email_mailbox/src/components/Thread.js b/email_mailbox/src/components/Thread.js
index 962c89089..b2830d65e 100644
--- a/email_mailbox/src/components/Thread.js
+++ b/email_mailbox/src/components/Thread.js
@@ -8,10 +8,7 @@ import './thread.css';
 
 class Thread extends Component {
   componentWillReceiveProps(nextProps) {
-    if (
-      this.props.thread.emailIds > nextProps.emailIds &&
-      !nextProps.emailIds.length
-    ) {
+    if (this.props.thread && !nextProps.thread) {
       this.props.onBackOption();
     } else if (this.props.thread.unread) {
       if (
@@ -36,7 +33,7 @@ class Thread extends Component {
         <div className="thread-content">
           <div className="thread-info">
             <div className="thread-info-title">
-              <h1>{this.props.thread.subject}</h1>
+              <h1>{this.props.thread ? this.props.thread.subject : ''}</h1>
               {this.props.labels.map((label, index) => {
                 return (
                   <Label
@@ -80,6 +77,12 @@ class Thread extends Component {
   componentDidMount() {
     if (this.props.emails.length !== this.props.thread.emailIds.length) {
       this.props.onLoadEmails(this.props.thread.threadId);
+    } else {
+      this.props.onUpdateUnreadEmails(
+        this.props.emailKeysUnread,
+        this.props.myEmailKeysUnread,
+        this.props.thread.threadId
+      );
     }
   }
 
diff --git a/email_mailbox/src/containers/HeaderThreadOptions.js b/email_mailbox/src/containers/HeaderThreadOptions.js
index b7ba795e9..42c79e202 100644
--- a/email_mailbox/src/containers/HeaderThreadOptions.js
+++ b/email_mailbox/src/containers/HeaderThreadOptions.js
@@ -132,6 +132,7 @@ const mapDispatchToProps = (dispatch, ownProps) => {
             isSpamLabelIdToAdd && isTrashCurrentLabelId
               ? isTrashCurrentLabelId
               : undefined,
+          currentLabelId,
           notMove
         })
       ).then(() => ownProps.onBackOption());
@@ -143,26 +144,17 @@ const mapDispatchToProps = (dispatch, ownProps) => {
     },
     onMarkRead: (threadIds, unread) => {
       const labelId = LabelType[ownProps.mailboxSelected].id;
-      const operation = !unread ? 'less' : 'add';
-      const paramsLabel =
-        labelId === LabelType.inbox.id || labelId === LabelType.spam.id
-          ? {
-              id: labelId,
-              operation: operation,
-              value: threadIds.length
-            }
-          : null;
-
-      dispatch(
-        actions.updateUnreadThreads(threadIds, unread, paramsLabel)
-      ).then(() => ownProps.onBackOption());
+      dispatch(actions.updateUnreadThreads(threadIds, unread, labelId)).then(
+        () => ownProps.onBackOption()
+      );
     },
     onRemoveThreads: async (threadIds, backFirst) => {
+      const labelId = LabelType[ownProps.mailboxSelected].id;
       if (backFirst) {
         await ownProps.onBackOption();
-        dispatch(actions.removeThreads(threadIds));
+        dispatch(actions.removeThreads(threadIds, labelId));
       } else {
-        dispatch(actions.removeThreads(threadIds)).then(() =>
+        dispatch(actions.removeThreads(threadIds, labelId)).then(() =>
           ownProps.onBackOption()
         );
       }
diff --git a/email_mailbox/src/containers/LabelEdit.js b/email_mailbox/src/containers/LabelEdit.js
index 8c913496a..0feaf41f3 100644
--- a/email_mailbox/src/containers/LabelEdit.js
+++ b/email_mailbox/src/containers/LabelEdit.js
@@ -5,22 +5,17 @@ import randomcolor from 'randomcolor';
 
 const mapDispatchToProps = dispatch => {
   return {
-    onAddLabel: (text, eventParams) => {
-      if (eventParams) {
-        const isByEvent = true;
-        dispatch(addLabel(eventParams, isByEvent));
-      } else {
-        const color = randomcolor({
-          seed: text,
-          luminosity: 'bright'
-        });
-        const label = {
-          text,
-          color,
-          visible: true
-        };
-        dispatch(addLabel(label));
-      }
+    onAddLabel: text => {
+      const color = randomcolor({
+        seed: text,
+        luminosity: 'bright'
+      });
+      const label = {
+        text,
+        color,
+        visible: true
+      };
+      dispatch(addLabel(label));
     }
   };
 };
diff --git a/email_mailbox/src/containers/Panel.js b/email_mailbox/src/containers/Panel.js
index a298cde4b..bd072a2d0 100644
--- a/email_mailbox/src/containers/Panel.js
+++ b/email_mailbox/src/containers/Panel.js
@@ -1,10 +1,11 @@
 import { connect } from 'react-redux';
 import {
+  addLabels,
   loadEmails,
   loadThreads,
   removeThreadsSuccess,
+  updateBadgeLabels,
   updateEmailIdsThread,
-  updateLabelSuccess,
   updateAllFeedItemsAsOlder,
   updateStatusThread,
   unsendEmailOnSuccess,
@@ -47,10 +48,8 @@ const defineRejectedLabels = labelId => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    onUpdateEmailIdsThread: ({ threadId, emailIdToAdd, emailIdsToRemove }) => {
-      dispatch(
-        updateEmailIdsThread({ threadId, emailIdToAdd, emailIdsToRemove })
-      );
+    onAddLabels: labels => {
+      dispatch(addLabels(labels));
     },
     onLoadEmails: threadId => {
       dispatch(loadEmails(threadId));
@@ -64,29 +63,29 @@ const mapDispatchToProps = dispatch => {
     onMarkThreadAsOpen: (threadId, status) => {
       dispatch(updateStatusThread(threadId, Number(status)));
     },
+    onRemoveThreads: threadIds => {
+      dispatch(removeThreadsSuccess(threadIds));
+    },
+    onUnsendEmail: (emailId, date, status) => {
+      dispatch(unsendEmailOnSuccess(String(emailId), date, status));
+      dispatch(unsendEmailFiles(emailId));
+    },
+    onUpdateEmailIdsThread: ({ threadId, emailIdToAdd, emailIdsToRemove }) => {
+      dispatch(
+        updateEmailIdsThread({ threadId, emailIdToAdd, emailIdsToRemove })
+      );
+    },
     onUpdateOpenedAccount: async () => {
       const opened = true;
       const recipientId = myAccount.recipientId;
       await updateAccount({ opened, recipientId });
     },
-    onUpdateUnreadEmailsBadge: ({ labelId, operation, value }) => {
-      const label = {
-        id: labelId,
-        operation,
-        value
-      };
-      dispatch(updateLabelSuccess(label));
-    },
     onUpdateTimestamp: () => {
       storeSeenTimestamp();
       dispatch(updateAllFeedItemsAsOlder());
     },
-    onUnsendEmail: (emailId, date, status) => {
-      dispatch(unsendEmailOnSuccess(String(emailId), date, status));
-      dispatch(unsendEmailFiles(emailId));
-    },
-    onRemoveThreads: threadIds => {
-      dispatch(removeThreadsSuccess(threadIds));
+    onUpdateUnreadEmailsBadge: labelIds => {
+      dispatch(updateBadgeLabels(labelIds));
     },
     onUpdateUnreadThreads: (threadIds, unread) => {
       dispatch(updateUnreadThreadsSuccess(threadIds, unread));
diff --git a/email_mailbox/src/containers/Settings.js b/email_mailbox/src/containers/Settings.js
index 697699fb2..74f657384 100644
--- a/email_mailbox/src/containers/Settings.js
+++ b/email_mailbox/src/containers/Settings.js
@@ -79,22 +79,17 @@ const formContactSupportEmailContent = () => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    onAddLabel: (text, eventParams) => {
-      if (eventParams) {
-        const isByEvent = true;
-        dispatch(addLabel(eventParams, isByEvent));
-      } else {
-        const color = randomcolor({
-          seed: text,
-          luminosity: 'bright'
-        });
-        const label = {
-          text,
-          color,
-          visible: true
-        };
-        dispatch(addLabel(label));
-      }
+    onAddLabel: text => {
+      const color = randomcolor({
+        seed: text,
+        luminosity: 'bright'
+      });
+      const label = {
+        text,
+        color,
+        visible: true
+      };
+      dispatch(addLabel(label));
     },
     onComposeContactSupportEmail: () => {
       const content = formContactSupportEmailContent();
diff --git a/email_mailbox/src/containers/Thread.js b/email_mailbox/src/containers/Thread.js
index b6c53f191..9be9ffcb1 100644
--- a/email_mailbox/src/containers/Thread.js
+++ b/email_mailbox/src/containers/Thread.js
@@ -72,11 +72,17 @@ const mapStateToProps = (state, ownProps) => {
     .map(email => email.key);
   const labelIds =
     LabelType[ownProps.mailboxSelected].id === LabelType.inbox.id
-      ? thread.get('allLabels')
-      : thread.get('labels');
-  const labels = defineLabels(state.get('labels'), labelIds);
-  const starred = thread.get('allLabels').contains(LabelType.starred.id);
-  const threadReadable = createReadableThread(thread);
+      ? thread
+        ? thread.get('allLabels')
+        : []
+      : thread
+        ? thread.get('labels')
+        : [];
+  const labels = thread ? defineLabels(state.get('labels'), labelIds) : [];
+  const starred = thread
+    ? thread.get('allLabels').contains(LabelType.starred.id)
+    : undefined;
+  const threadReadable = thread ? createReadableThread(thread) : undefined;
   return {
     emails,
     emailKeysUnread,
@@ -87,7 +93,7 @@ const mapStateToProps = (state, ownProps) => {
   };
 };
 
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch, ownProps) => {
   return {
     onLoadEmails: threadId => {
       return dispatch(loadEmails(threadId));
@@ -105,7 +111,10 @@ const mapDispatchToProps = dispatch => {
     },
     onUpdateUnreadEmails: (emailKeysUnread, myEmailKeysUnread, threadId) => {
       if (emailKeysUnread.length || myEmailKeysUnread.length) {
-        dispatch(sendOpenEvent(emailKeysUnread, myEmailKeysUnread, threadId));
+        const labelId = LabelType[ownProps.mailboxSelected].id;
+        dispatch(
+          sendOpenEvent(emailKeysUnread, myEmailKeysUnread, threadId, labelId)
+        );
       }
     }
   };
diff --git a/email_mailbox/src/containers/ThreadItem.js b/email_mailbox/src/containers/ThreadItem.js
index a85a101d2..5571d268a 100644
--- a/email_mailbox/src/containers/ThreadItem.js
+++ b/email_mailbox/src/containers/ThreadItem.js
@@ -152,7 +152,8 @@ const mapDispatchToProps = (dispatch, ownProps) => {
       dispatch(
         actions.addMoveLabelIdThreads({
           threadsParams: [threadParams],
-          labelIdToAdd: labelId
+          labelIdToAdd: labelId,
+          currentLabelId
         })
       );
     },
diff --git a/email_mailbox/src/data/message.js b/email_mailbox/src/data/message.js
index 48eb54ee9..61e6568ec 100644
--- a/email_mailbox/src/data/message.js
+++ b/email_mailbox/src/data/message.js
@@ -87,6 +87,10 @@ const messagesContent = {
       priority: messagePriorities.MEDIUM,
       description: 'Failed to send your message'
     },
+    updateLabels: {
+      priority: messagePriorities.MEDIUM,
+      description: 'Error updating labels. Please try again'
+    },
     updateThreadLabels: {
       priority: messagePriorities.MEDIUM,
       description: 'Error updating email labels. Please try again'
diff --git a/email_mailbox/src/reducers/__tests__/__snapshots__/labels.js.snap b/email_mailbox/src/reducers/__tests__/__snapshots__/labels.js.snap
index 8128f4d00..de1388e97 100644
--- a/email_mailbox/src/reducers/__tests__/__snapshots__/labels.js.snap
+++ b/email_mailbox/src/reducers/__tests__/__snapshots__/labels.js.snap
@@ -1,77 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Label actions: should add labels 1`] = `
+exports[`Label actions - ADD_BATCH should add labels to state 1`] = `
 Immutable.Map {
   1: Immutable.Map {
     id: 1,
     color: "#ffffff",
     text: "Inbox",
-  },
-  2: Immutable.Map {
-    id: 2,
-    color: "#ffffff",
-    text: "Sent",
-  },
-  3: Immutable.Map {
-    id: 3,
-    color: "#ffffff",
-    text: "Spam",
-  },
-  4: Immutable.Map {
-    id: 4,
-    color: "#ffffff",
-    text: "Trash",
-  },
-  5: Immutable.Map {
-    id: 5,
-    color: "#ffffff",
-    text: "Draft",
-  },
-  6: Immutable.Map {
-    id: 6,
-    color: "#ffffff",
-    text: "Starred",
-  },
-  10: Immutable.Map {
-    id: 10,
-    color: "#ffffff",
-    text: "Text 1",
-  },
-}
-`;
-
-exports[`Label actions: should update label: color 1`] = `
-Immutable.Map {
-  1: Immutable.Map {
-    id: 1,
-    color: "#000000",
-    text: "Inbox",
-    badge: 1,
-    visible: undefined,
-  },
-}
-`;
-
-exports[`Label actions: should update label: text 1`] = `
-Immutable.Map {
-  1: Immutable.Map {
-    id: 1,
-    color: "#ffffff",
-    text: "labelmodified",
-    badge: 1,
-    visible: undefined,
-  },
-}
-`;
-
-exports[`Label actions: should update label: text and color 1`] = `
-Immutable.Map {
-  1: Immutable.Map {
-    id: 1,
-    color: "#000000",
-    text: "labelmodified",
     badge: 1,
-    visible: undefined,
+    visible: true,
   },
 }
 `;
diff --git a/email_mailbox/src/reducers/__tests__/labels.js b/email_mailbox/src/reducers/__tests__/labels.js
index c1d4f406a..d3d8053f7 100644
--- a/email_mailbox/src/reducers/__tests__/labels.js
+++ b/email_mailbox/src/reducers/__tests__/labels.js
@@ -4,180 +4,117 @@ import labelReducer from './../labels';
 import * as actions from './../../actions/index';
 import { Map } from 'immutable';
 import file from './../../../public/labels.json';
-const labels = file.labels;
-const label = labels[0];
 
 jest.mock('./../../utils/electronInterface');
 jest.mock('./../../utils/electronEventInterface');
 jest.mock('./../../utils/electronUtilsInterface');
 
-describe('Label actions:', () => {
-  it('should add labels', () => {
-    const data = {};
-    labels.forEach(element => {
-      data[element.id] = {
-        id: element.id,
-        color: element.color,
-        text: element.text
-      };
-    });
-    const action = actions.addLabels(data);
-    const state = labelReducer(undefined, action);
-    expect(state).toMatchSnapshot();
-  });
+const myLabels = file.labels;
 
-  it('should update label: text and color', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
-    });
-    const action = actions.updateLabelSuccess({
-      id: 1,
-      color: '#000000',
-      text: 'labelmodified'
-    });
-    const state = labelReducer(data, action);
-    expect(state).toMatchSnapshot();
-  });
+function initState(labels) {
+  const data = labels.reduce(
+    (result, element) => ({
+      ...result,
+      [element.id]: element
+    }),
+    {}
+  );
+  return labelReducer(undefined, actions.addLabels(data));
+}
 
-  it('should update label: color', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
-    });
-    const action = actions.updateLabelSuccess({ id: 1, color: '#000000' });
-    const state = labelReducer(data, action);
-    expect(state).toMatchSnapshot();
-  });
+describe('Label actions - ADD_BATCH', () => {
+  const labels = [myLabels[0]];
 
-  it('should update label: text', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
-    });
-    const action = actions.updateLabelSuccess({ id: 1, text: 'labelmodified' });
-    const state = labelReducer(data, action);
-    expect(state).toMatchSnapshot();
+  it('should add labels to state', () => {
+    expect(initState(labels)).toMatchSnapshot();
   });
+});
 
-  it('should update label: add badge', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
-    });
-    const operation = 'add';
-    const action = actions.updateLabelSuccess({ id: 1, operation, value: 1 });
-    const state = labelReducer(data, action);
-    expect(state.get('1').get('badge')).toEqual(2);
-  });
+describe('Label actions - UPDATE', () => {
+  const labels = [myLabels[0]];
 
-  it('should update label: less badge', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
+  it('should update label: text, color, visible, badge', () => {
+    const state = initState(labels);
+    const badge = 10;
+    const color = '#000000';
+    const text = 'labelmodified';
+    const visible = false;
+    const action = actions.updateLabelSuccess({
+      id: 1,
+      badge,
+      color,
+      text,
+      visible
     });
-    const operation = 'less';
-    const action = actions.updateLabelSuccess({ id: 1, operation, value: 1 });
-    const state = labelReducer(data, action);
-    expect(state.get('1').get('badge')).toEqual(0);
-  });
-
-  it('should not update label: error badge value 0', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
+    const newState = labelReducer(state, action);
+    const labelUpdated = newState.get('1');
+    expect(labelUpdated.toJS()).toMatchObject(
+      expect.objectContaining({
+        color,
+        text,
+        visible
       })
-    });
-    const operation = 'add';
-    const action = actions.updateLabelSuccess({ id: 1, operation, value: 0 });
-    const state = labelReducer(data, action);
-    expect(state.get('1').get('badge')).toEqual(1);
+    );
   });
 
-  it('should not update label: error badge operation undefined', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
+  it('should update label: badge', () => {
+    const state = initState(labels);
+    const badge = 0;
+    const action = actions.updateLabelSuccess({
+      id: 1,
+      badge
     });
-    const operation = undefined;
-    const action = actions.updateLabelSuccess({ id: 1, operation, value: 1 });
-    const state = labelReducer(data, action);
-    expect(state.get('1').get('badge')).toEqual(1);
+    const newState = labelReducer(state, action);
+    const labelUpdated = newState.get('1');
+    expect(labelUpdated.toJS()).toMatchObject(
+      expect.objectContaining({
+        badge
+      })
+    );
   });
 
-  it('should not update label: error badge negative', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
+  it('should not update label: id not exist', () => {
+    const state = initState(labels);
+    const color = '#000000';
+    const text = 'labelmodified';
+    const action = actions.updateLabelSuccess({
+      color,
+      text
     });
-    const operation = 'less';
-    const action = actions.updateLabelSuccess({ id: 1, operation, value: 2 });
-    const state = labelReducer(data, action);
-    expect(state.get('1').get('badge')).toEqual(0);
+    const newState = labelReducer(state, action);
+    const labelUpdated = newState.get('1');
+    expect(labelUpdated.toJS()).toMatchObject(
+      expect.objectContaining({
+        color: labels[0].color,
+        text: labels[0].text
+      })
+    );
   });
 
-  it('should not update label', () => {
-    const data = Map({
-      [label.id]: Map({
-        id: label.id,
-        color: label.color,
-        text: label.text,
-        badge: label.badge
-      })
-    });
+  it('should not update label: badge is not type of number and visible is not typeof true', () => {
+    const state = initState(labels);
+    const badge = '1';
+    const visible = 'true';
     const action = actions.updateLabelSuccess({
-      color: '#000000',
-      text: 'labelmodified'
+      id: 1,
+      badge,
+      visible
     });
-    const state = labelReducer(data, action);
-    expect(state).toEqual(data);
+    const newState = labelReducer(state, action);
+    const labelUpdated = newState.get('1');
+    expect(labelUpdated.toJS()).toMatchObject(
+      expect.objectContaining({
+        badge: labels[0].badge,
+        visible: !!labels[0].visible
+      })
+    );
   });
 
   it('should remove label', () => {
-    const labelId = '0';
-    const data = Map({
-      [labelId]: Map({
-        id: labelId,
-        color: '#000',
-        text: 'ToRemove',
-        badge: 0,
-        visible: false
-      })
-    });
-    const emptyState = new Map({});
+    const state = initState(labels);
+    const labelId = '1';
     const action = actions.removeLabelOnSuccess(labelId);
-    const state = labelReducer(data, action);
-    expect(state).toBe(emptyState);
+    const newState = labelReducer(state, action);
+    expect(newState).toBe(new Map({}));
   });
 });
diff --git a/email_mailbox/src/reducers/labels.js b/email_mailbox/src/reducers/labels.js
index 5e89dc5e6..aa8cc0bbd 100644
--- a/email_mailbox/src/reducers/labels.js
+++ b/email_mailbox/src/reducers/labels.js
@@ -3,16 +3,49 @@ import { Map, fromJS } from 'immutable';
 
 const labels = (state = new Map({}), action) => {
   switch (action.type) {
-    case Label.ADD_BATCH:
-      return state.merge(fromJS(action.labels));
-    case Label.UPDATE_SUCCESS: {
+    case Label.ADD_BATCH: {
+      const labels = fromJS(action.labels);
+      const batch = labels.map(label => {
+        const visible = !!label.get('visible');
+        return label.merge({
+          visible
+        });
+      });
+      return state.merge(batch);
+    }
+    case Label.UPDATE: {
       const labelId = action.label.id;
       if (!labelId) {
         return state;
       }
       return state.set(`${labelId}`, label(state.get(`${labelId}`), action));
     }
-    case Label.REMOVE_SUCCESS: {
+    case Label.UPDATE_BADGE_LABELS: {
+      const labelIds = action.labelIds;
+      if (!labelIds) {
+        return state;
+      }
+      if (labelIds.length === 2) {
+        return state.merge({
+          [`${labelIds[0].id}`]: label(state.get(`${labelIds[0].id}`), {
+            ...action,
+            label: labelIds[0]
+          }),
+          [`${labelIds[1].id}`]: label(state.get(`${labelIds[1].id}`), {
+            ...action,
+            label: labelIds[1]
+          })
+        });
+      }
+      return state.set(
+        `${labelIds[0].id}`,
+        label(state.get(`${labelIds[0].id}`), {
+          ...action,
+          label: labelIds[0]
+        })
+      );
+    }
+    case Label.REMOVE: {
       const { labelId } = action;
       if (!labelId) {
         return state;
@@ -26,22 +59,15 @@ const labels = (state = new Map({}), action) => {
 
 const label = (state, action) => {
   switch (action.type) {
-    case Label.UPDATE_SUCCESS: {
-      let badge = state.get('badge');
-      if (action.label.operation === 'add') {
-        badge = state.get('badge') + action.label.value;
-      } else if (action.label.operation === 'less') {
-        const operationValue = state.get('badge') - action.label.value;
-        badge = operationValue >= 0 ? operationValue : 0;
-      }
+    case Label.UPDATE:
+    case Label.UPDATE_BADGE_LABELS: {
+      const visible = action.label.visible;
+      const badge = action.label.badge;
       return state.merge({
-        color: action.label.color ? action.label.color : state.get('color'),
-        text: action.label.text ? action.label.text : state.get('text'),
-        visible:
-          action.label.visible !== undefined
-            ? action.label.visible
-            : state.get('visible'),
-        badge
+        badge: typeof badge === 'number' ? badge : state.get('badge'),
+        color: action.label.color || state.get('color'),
+        text: action.label.text || state.get('text'),
+        visible: typeof visible === 'boolean' ? visible : state.get('visible')
       });
     }
     default:
diff --git a/email_mailbox/src/utils/electronEventInterface.js b/email_mailbox/src/utils/electronEventInterface.js
index c4f27db5b..d99bfddfb 100644
--- a/email_mailbox/src/utils/electronEventInterface.js
+++ b/email_mailbox/src/utils/electronEventInterface.js
@@ -3,6 +3,7 @@ import {
   acknowledgeEvents,
   createEmail,
   createEmailLabel,
+  createLabel,
   getEmailByKey,
   getEmailsByKeys,
   getEmailLabelsByEmailId,
@@ -251,11 +252,11 @@ const handleNewMessageEvent = async ({ rowid, params }) => {
   const isSpam = labels
     ? labels.find(label => label === LabelType.spam.text)
     : undefined;
-  const InboxLabel = LabelType.inbox.id;
-  const SentLabel = LabelType.sent.id;
+  const InboxLabelId = LabelType.inbox.id;
+  const SentLabelId = LabelType.sent.id;
   const isToMe = EmailUtils.checkEmailIsTo({ to, cc, bcc, type: 'to' });
   const isFromMe = EmailUtils.checkEmailIsTo({ from, type: 'from' });
-  let eventParams = { isToMe };
+  let eventParams = {};
 
   if (!prevEmail) {
     const body = await signal.decryptEmail({
@@ -307,10 +308,10 @@ const handleNewMessageEvent = async ({ rowid, params }) => {
 
     const labels = isSpam ? [LabelType.spam.id] : [];
     if (isToMe) {
-      labels.push(InboxLabel);
+      labels.push(InboxLabelId);
     }
     if (isFromMe) {
-      labels.push(SentLabel);
+      labels.push(SentLabelId);
     }
     const emailData = {
       email,
@@ -332,14 +333,14 @@ const handleNewMessageEvent = async ({ rowid, params }) => {
     const prevEmailLabels = await getEmailLabelsByEmailId(prevEmail.id);
     const prevLabels = prevEmailLabels.map(item => item.labelId);
 
-    const hasInboxLabel = prevLabels.includes(InboxLabel);
-    if (isToMe && !hasInboxLabel) {
-      labels.push(InboxLabel);
+    const hasInboxLabelId = prevLabels.includes(InboxLabelId);
+    if (isToMe && !hasInboxLabelId) {
+      labels.push(InboxLabelId);
     }
 
-    const hasSentLabel = prevLabels.includes(SentLabel);
-    if (isFromMe && !hasSentLabel) {
-      labels.push(SentLabel);
+    const hasSentLabelId = prevLabels.includes(SentLabelId);
+    if (isFromMe && !hasSentLabelId) {
+      labels.push(SentLabelId);
     }
     if (labels.length) {
       const emailLabel = formEmailLabel({ emailId: prevEmail.id, labels });
@@ -442,12 +443,7 @@ const handlePeerEmailRead = async ({ rowid, params }) => {
     keys: emailKeys,
     unread: !!unread
   });
-  const eventParams = {
-    labelId: LabelType.inbox.id,
-    operation: unread ? 'add' : 'less',
-    value: emailKeys.length
-  };
-  emitter.emit(Event.REFRESH_THREADS, emailKeys.length ? eventParams : null);
+  emitter.emit(Event.REFRESH_THREADS, { labelIds: [LabelType.inbox.id] });
   if (res) {
     await setEventAsHandled(rowid);
   }
@@ -505,7 +501,16 @@ const handlePeerThreadLabelsUpdate = async ({ rowid, params }) => {
     labelIdsToRemove
   });
   await setEventAsHandled(rowid);
-  emitter.emit(Event.REFRESH_THREADS, null);
+  const hasInbox =
+    labelIdsToAdd.includes(LabelType.inbox.id) ||
+    labelIdsToRemove.includes(LabelType.inbox.id);
+  const hasSpam =
+    labelIdsToAdd.includes(LabelType.spam.id) ||
+    labelIdsToRemove.includes(LabelType.spam.id);
+  let labelIds = [];
+  if (hasInbox) labelIds = [...labelIds, LabelType.inbox.id];
+  if (hasSpam) labelIds = [...labelIds, LabelType.spam.id];
+  emitter.emit(Event.REFRESH_THREADS, { labelIds });
 };
 
 const formAndSaveEmailLabelsUpdate = async ({
@@ -555,11 +560,17 @@ const handlePeerLabelCreated = async ({ rowid, params }) => {
   const { text, color } = params;
   const [label] = await getLabelsByText([text]);
   if (!label) {
-    await emitter.emit(Event.LABEL_CREATED, {
-      text,
-      color: `#${color}`,
-      visible: true
-    });
+    const [labelId] = await createLabel({ text, color: `#${color}` });
+    const labels = {
+      [labelId]: {
+        id: labelId,
+        color: `#${color}`,
+        text,
+        type: 'custom',
+        visible: true
+      }
+    };
+    await emitter.emit(Event.LABEL_CREATED, labels);
   }
   await setEventAsHandled(rowid);
 };
@@ -610,12 +621,9 @@ const setEventAsHandled = async eventId => {
 /* Window events
   ----------------------------- */
 
-ipcRenderer.on('update-drafts', (ev, data) => {
-  if (data) {
-    const labelId = LabelType.draft.id;
-    data = { ...data, labelId };
-  }
-  emitter.emit(Event.REFRESH_THREADS, data);
+ipcRenderer.on('update-drafts', (ev, shouldUpdateBadge) => {
+  const labelId = shouldUpdateBadge ? LabelType.draft.id : undefined;
+  emitter.emit(Event.REFRESH_THREADS, { labelIds: [labelId] });
 });
 
 ipcRenderer.on('display-message-email-sent', (ev, { emailId }) => {
@@ -668,6 +676,14 @@ ipcRenderer.on('password-changed', () => {
   return sendPasswordChangedEvent();
 });
 
+export const sendUpdateLabelsErrorMessage = () => {
+  const messageData = {
+    ...Messages.error.updateLabels,
+    type: MessageType.ERROR
+  };
+  emitter.emit(Event.DISPLAY_MESSAGE, messageData);
+};
+
 export const sendUpdateThreadLabelsErrorMessage = () => {
   const messageData = {
     ...Messages.error.updateThreadLabels,