Index: program/steps/mail/func.inc
===================================================================
--- program/steps/mail/func.inc	(revision 6925adb279131224d48ff8d5cb0f57aa9f167916)
+++ program/steps/mail/func.inc	(revision 6d20d016d5bc33b5f4a40d12bc765535fd88043b)
@@ -457,11 +457,5 @@
   $OUTPUT->add_gui_object('quotadisplay', $attrib['id']);
 
-  // allow the following attributes to be added to the <span> tag
-  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'display'));
-
-  $out = '<span' . $attrib_str . '>';
-  $out .= rcmail_quota_content(NULL, $attrib);
-  $out .= '</span>';
-  return $out;
+  return html::span($attrib, rcmail_quota_content(NULL, $attrib));
   }
 
