diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 5dc0c6247e2..d044bece4e1 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -2448,11 +2448,11 @@ public function get_message_part($uid, $part = 1, $o_part = null, $print = null,
             $part_data = rcube_imap_generic::getStructurePartData($structure, $part);
 
             $o_part = new rcube_message_part;
-            $o_part->ctype_primary   = $part_data['type'];
-            $o_part->ctype_secondary = $part_data['subtype'];
-            $o_part->encoding        = $part_data['encoding'];
-            $o_part->charset         = $part_data['charset'];
-            $o_part->size            = $part_data['size'];
+            $o_part->ctype_primary   = $part_data['type'] ?? null;
+            $o_part->ctype_secondary = $part_data['subtype'] ?? null;
+            $o_part->encoding        = $part_data['encoding'] ?? null;
+            $o_part->charset         = $part_data['charset'] ?? null;
+            $o_part->size            = $part_data['size'] ?? 0;
         }
 
         $body = '';
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 8d5a620b43b..c1ec5f95b14 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -1625,9 +1625,15 @@ private function _ldap2result($rec)
 
         // determine record type
         if ($this->is_group_entry($rec)) {
-            $out['_type']     = 'group';
-            $out['readonly']  = true;
-            $fieldmap['name'] = $this->group_data['name_attr'] ?: $this->prop['groups']['name_attr'];
+            $out['_type']    = 'group';
+            $out['readonly'] = true;
+
+            if (!empty($this->group_data['name_attr'])) {
+                $fieldmap['name'] = $this->group_data['name_attr'];
+            }
+            else {
+                $fieldmap['name'] = $this->prop['groups']['name_attr'];
+            }
         }
 
         // assign object type from object class mapping