diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index b22f84c1e..10116df25 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1489,8 +1489,6 @@ class rcube
         else if (isset($_SESSION['user_id'])) {
             return $_SESSION['user_id'];
         }
-
-        return null;
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
index 8434239c6..6c885b4fe 100644
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@@ -360,7 +360,6 @@ abstract class rcube_addressbook
     function get_group($group_id)
     {
         /* empty for address books don't supporting groups */
-        return null;
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index 479cbb6e0..45c48c94e 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -82,8 +82,6 @@ class rcube_image
                 'channels' => $channels,
             );
         }
-
-        return null;
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index d3fa759b0..96aa3901f 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -2924,7 +2924,7 @@ class rcube_imap extends rcube_storage
     public function list_folders_subscribed_direct($root = '', $name = '*')
     {
         if (!$this->check_connection()) {
-           return null;
+            return null;
         }
 
         $config    = rcube::get_instance()->config;
diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php
index 671ebc6d2..5c83ba99d 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -55,8 +55,6 @@ abstract class rcube_output
             case 'skins':   return $this->skins;
             case 'charset': return $this->charset;
         }
-
-        return null;
     }
 
     /**