diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/defaults.php
index 0248af5469..d06bbbd21e 100644
--- a/lib/private/legacy/defaults.php
+++ b/lib/private/legacy/defaults.php
@@ -276,11 +276,14 @@ class OC_Defaults {
 	 * @return string
 	 */
 	public function getColorPrimary() {
+
 		if ($this->themeExist('getColorPrimary')) {
 			return $this->theme->getColorPrimary();
-		} else {
-			return $this->defaultMailHeaderColor;
 		}
+		if ($this->themeExist('getMailHeaderColor')) {
+			return $this->theme->getMailHeaderColor();
+		}
+		return $this->defaultMailHeaderColor;
 	}
 
 	public function shouldReplaceIcons() {