Merge branch 'master' into newprefs

diff --cc framework/ActiveSync/lib/Horde/ActiveSync.php
Simple merge

diff --cc framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php
Simple merge

diff --cc framework/ActiveSync/lib/Horde/ActiveSync/State/File.php
Simple merge

diff --cc imp/config/prefs.php.dist
index 63883bb,20732cf..034ba87
--- 1/imp/config/prefs.php.dist
--- 2/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@@ -1104,27 -1274,35 +1107,40 @@@ $_prefs['msgflags'] = array
              // Pursuant to RFC, this flag SHOULD NOT be changed by the user
              't' => 'imap'
          ),
 -    )),
 -    'locked' => false,
 -    'shared' => false,
 -    'type' => 'implicit'
 +    ))
  );
  
+ // Message flags - user specific
+ // This array contains the list of flags created by the user through the
+ // flags UI. Additionally, an admin can define default non-system flags
+ // for a user in this preference.
+ // See the 'msgflags' preference for the format of this value.
+ $_prefs['msgflags_user'] = array(
+     // 'value' = json_encode(array())
+     'value' => '[]',
+     'locked' => false,
+     'shared' => false,
+     'type' => 'implicit'
+ );
+ 
  // The default color to use for flags that don't require row highlighting.
  $_prefs['msgflags_color'] = array(
 -    'value' => '#ffffff',
 -    'locked' => false,
 -    'shared' => false,
 -    'type' => 'implicit');
 +    'value' => '#ffffff'
 +);
  
 -// End IMAP Flag preferences
  
 -// Display Options preferences
 +
 +// *** Mailbox Display Preferences ***
 +
 +$prefGroups['mboxdisplay'] = array(
 +    'column' => _("Other Options"),
 +    'label' => _("Mailbox Display Options"),
 +    'desc' => _("Change display options such as how many messages you see on each page and how messages are sorted."),
 +    'members' => array(
 +        'mailbox_start', 'sortby', 'sortdir', 'max_msgs', 'from_link',
 +        'time_format', 'atc_flag'
 +    )
 +);
  
  // Where to start when opening mailbox?
  $_prefs['mailbox_start'] = array(