diff --git a/commons_groups.module b/commons_groups.module
index d1486bc..901cb8e 100644
--- a/commons_groups.module
+++ b/commons_groups.module
@@ -1133,7 +1133,7 @@ function commons_groups_privatemsg_write_access($uid) {
  * Implement hook_form_FORM_alter().
  */
 function commons_groups_form_privatemsg_new_alter(&$form, &$form_state) {
-  $form['body']['#type'] = 'plain_text';
+  $form['body']['#format'] = 'plain_text';
 }
 
 /**
@@ -1190,21 +1190,12 @@ function commons_groups_operations_load_action_includes() {
  *    The addressee's account.
  */
 function commons_groups_messages_popup($form, &$form_state, $account) {
-  $wrapper = entity_metadata_wrapper('user', $account);
-  $picture_path = empty($account->picture) ? variable_get('user_picture_default') : $wrapper->value()->picture->uri;
+  global $user;
 
-  $form['user_picture'] = array(
-    '#theme' => 'image_style',
-    '#style_name' => '50x50_avatar',
-    '#path' => $picture_path,
-    '#prefix' => '<div class="user-picture">',
-    '#suffix' => '</div>',
-  );
+  // Include original functions.
+  require_once(drupal_get_path('module', 'privatemsg') . '/privatemsg.pages.inc');
 
-  $form['body'] = array(
-    '#type' => 'textarea',
-    '#rows' => 6,
-  );
+  $form = privatemsg_new($form, $form_state, $account->uid, 'New private message from ' . $user->name);
 
   $form['actions'] = array('#type' => 'actions');
 
@@ -1218,5 +1209,57 @@ function commons_groups_messages_popup($form, &$form_state, $account) {
     '#markup' => l(t('Go to full form'), 'messages/new/' . $account->uid),
   );
 
+
+  $wrapper = entity_metadata_wrapper('user', $account);
+  $picture_path = empty($account->picture) ? variable_get('user_picture_default') : $wrapper->value()->picture->uri;
+
+  $form['user_picture'] = array(
+    '#theme' => 'image_style',
+    '#style_name' => '50x50_avatar',
+    '#path' => $picture_path,
+    '#prefix' => '<div class="user-picture">',
+    '#suffix' => '</div>',
+    '#weight' => -50,
+  );
+
+  $form['body']['#format'] = 'plain_text';
+
+  unset($form['token']);
+
+  $form['subject']['#type'] = 'hidden';
+
+  $form['recipient']['#type'] = 'hidden';
+
+  drupal_set_title(t('Direct Message @recipient', array('@recipient' => $account->name)));
+
   return $form;
 }
+
+/**
+ * Implements hook_privatemsg_message_insert().
+ *
+ * When a private message is sent, update the recipients' notification counts.
+ */
+function commons_groups_privatemsg_message_insert($message) {
+  foreach ($message->recipients as $recipient) {
+    commons_notify_add_notification_item($recipient);
+  }
+}
+
+/**
+ * Implements hook_privatemsg_message_status_changed().
+ *
+ * When a private message changes status from 'read' to 'unread' or vice versa,
+ * update the recipients' notification counts accordingly.
+ */
+function commons_groups_privatemsg_message_status_changed($pmid, $status, $account) {
+  if ($status) {
+    // Status changed to unread.
+    commons_notify_add_notification_item($account);
+  }
+  else {
+    // Status changed to read.
+    commons_notify_remove_notification_item($account);
+  }
+}
+
diff --git a/modules/commons_group_privacy/commons_group_privacy.info b/modules/commons_group_privacy/commons_group_privacy.info
index a5714a7..a33c8b0 100644
--- a/modules/commons_group_privacy/commons_group_privacy.info
+++ b/modules/commons_group_privacy/commons_group_privacy.info
@@ -11,4 +11,11 @@ features[field_base][] = group_content_access
 features[field_base][] = og_roles_permissions
 features[field_instance][] = node-group-group_access
 features[field_instance][] = node-group-og_roles_permissions
-features[field_instance][] = node-post-group_content_access
\ No newline at end of file
+features[field_instance][] = node-post-group_content_access
+
+; Information added by drush on 2013-04-22
+version = "7.x-3.0+21-dev"
+core = "7.x"
+project = "commons_groups"
+datestamp = "1366616163"
+
diff --git a/modules/commons_groups_directory/commons_groups_directory.info b/modules/commons_groups_directory/commons_groups_directory.info
index c587a61..0ad5f07 100644
--- a/modules/commons_groups_directory/commons_groups_directory.info
+++ b/modules/commons_groups_directory/commons_groups_directory.info
@@ -17,3 +17,11 @@ features[ctools][] = panelizer:panelizer:1
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:1
 features[page_manager_pages][] = groups_directory
+
+
+; Information added by drush on 2013-04-22
+version = "7.x-3.0+21-dev"
+core = "7.x"
+project = "commons_groups"
+datestamp = "1366616163"
+
diff --git a/modules/commons_groups_pages/commons_groups_pages.info b/modules/commons_groups_pages/commons_groups_pages.info
index 2b341fd..a49d8f4 100644
--- a/modules/commons_groups_pages/commons_groups_pages.info
+++ b/modules/commons_groups_pages/commons_groups_pages.info
@@ -18,3 +18,11 @@ features[features_api][] = api:1
 features[panelizer_defaults][] = node:group:default
 features[panelizer_defaults][] = node:group:default:teaser
 features[variable][] = panelizer_defaults_node_group
+
+
+; Information added by drush on 2013-04-22
+version = "7.x-3.0+21-dev"
+core = "7.x"
+project = "commons_groups"
+datestamp = "1366616163"
+