From aa051875f9588306c9636e3622518fab3e942f5e Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Tue, 21 Jul 2020 17:40:22 +0200
Subject: [PATCH] improve default notification fallback

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/public/Activity/ActivitySettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/Activity/ActivitySettings.php b/lib/public/Activity/ActivitySettings.php
index c25e8d2c9f..4c96b83199 100644
--- a/lib/public/Activity/ActivitySettings.php
+++ b/lib/public/Activity/ActivitySettings.php
@@ -74,6 +74,6 @@ abstract class ActivitySettings {
 	 * @since 20.0.0
 	 */
 	public function isDefaultEnabledNotification() {
-		return $this->isDefaultEnabledMail();
+		return $this->isDefaultEnabledMail() && !$this->canChangeMail();
 	}
 }