diff --git a/public/main/inc/lib/message.lib.php b/public/main/inc/lib/message.lib.php
index b8750e40d0..2d1024abd9 100644
--- a/public/main/inc/lib/message.lib.php
+++ b/public/main/inc/lib/message.lib.php
@@ -409,7 +409,9 @@ class MessageManager
                         $subject,
                         $content,
                         $group_info,
-                        $attachmentAddedByMail
+                        $attachmentAddedByMail,
+                        $forceTitleWhenSendingEmail,
+                        $baseUrl
                     );
                 }
             }
diff --git a/src/CoreBundle/ServiceHelper/AccessUrlHelper.php b/src/CoreBundle/ServiceHelper/AccessUrlHelper.php
index c2793ee913..255204c367 100644
--- a/src/CoreBundle/ServiceHelper/AccessUrlHelper.php
+++ b/src/CoreBundle/ServiceHelper/AccessUrlHelper.php
@@ -43,6 +43,10 @@ class AccessUrlHelper
             return $accessUrl;
         }
 
+        if ('cli' === PHP_SAPI) {
+            return $this->getFirstAccessUrl();
+        }
+
         $accessUrl = $this->getFirstAccessUrl();
 
         if ($this->isMultiple()) {
diff --git a/src/CoreBundle/ServiceHelper/ThemeHelper.php b/src/CoreBundle/ServiceHelper/ThemeHelper.php
index 792d82593f..d228b4cf38 100644
--- a/src/CoreBundle/ServiceHelper/ThemeHelper.php
+++ b/src/CoreBundle/ServiceHelper/ThemeHelper.php
@@ -40,10 +40,6 @@ final class ThemeHelper
      */
     public function getVisualTheme(): string
     {
-        if ('cli' === PHP_SAPI) {
-            return '';
-        }
-
         static $visualTheme;
 
         global $lp_theme_css;