diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index 182910d8f..551a26659 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -518,7 +518,7 @@ trait Folders
 				if (isset($aMap[$sName]) || isset($aMap[$sFullName]))
 				{
 					$iFolderType = isset($aMap[$sName]) ? $aMap[$sName] : $aMap[$sFullName];
-					if (!isset($aResult[$iFolderType]) && \in_array($iFolderType, array(
+					if ((!isset($aResult[$iFolderType]) || $sName === $sFullName || "INBOX{$oFolder->Delimiter()}{$sName}" === $sFullName) && \in_array($iFolderType, array(
 						FolderType::INBOX,
 						FolderType::SENT,
 						FolderType::DRAFTS,