diff --git a/sites/all/modules/messaging/messaging.module b/sites/all/modules/messaging/messaging.module
index eb730f9..18ba7b5 100644
--- a/sites/all/modules/messaging/messaging.module
+++ b/sites/all/modules/messaging/messaging.module
@@ -122,7 +122,7 @@ function messaging_perm() {
 function messaging_user($type, $edit, &$user, $category = NULL) {
   switch ($type) {
     case 'form':
-      if ($category == 'account' && ($list = messaging_method_list($user))) {
+      if ($category == 'account' && ($list = messaging_method_list($user)) && count($list) > 1) {
         $form['messaging'] = array(
           '#type'        => 'fieldset',
           '#title'       => t('Messaging settings'),
@@ -135,7 +135,6 @@ function messaging_user($type, $edit, &$user, $category = NULL) {
           '#default_value' => messaging_method_default($user),
           '#options' => $list,
           '#description'   => t('Default sending method for getting messages from this system.'),
-          '#disabled' => count($list) == 1,
         );
         return $form;
       }