diff --git a/plugins/content_types/privatemsg.inc b/plugins/content_types/privatemsg.inc
index 4af490c..5639574 100644
--- a/plugins/content_types/privatemsg.inc
+++ b/plugins/content_types/privatemsg.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+
 /**
  * @file
  *   test
@@ -29,6 +29,11 @@ function privatemsg_panels_privatemsg_content_type_render($subtype, $conf, $pane
   $block->module = 'privatemsg';
   $block->delta = 'list';
   $block->title = privatemsg_title_callback('Messages');
-
+  module_load_include('inc', 'privatemsg', 'privatemsg.pages');
+  $block->content = privatemsg_list_page('list');
+  return $block;
 }
 
+function privatemsg_panels_privatemsg_content_type_edit_form($form, $form_state) {
+  return $form;
+}
diff --git a/plugins/content_types/privatemsg_actionlinks.inc b/plugins/content_types/privatemsg_actionlinks.inc
index dba7cef..7a12b2f 100644
--- a/plugins/content_types/privatemsg_actionlinks.inc
+++ b/plugins/content_types/privatemsg_actionlinks.inc
@@ -1,11 +1,10 @@
 <?php
-// $Id$
+
 /**
  * @file
  *   TODO
  */
 
-
 /**
  * Implementation of hook_ctools_content_types().
  */
@@ -28,4 +27,3 @@ function privatemsg_panels_private_actionlinks_ctools_content_types() {
 // The function name is <code>MODULE_NAME_CT_NAME_content_type_render
 function privatemsg_panels_privatemsg_actionlinks_content_type_render($subtype, $conf, $panel_args, $context) {
 }
-
diff --git a/plugins/content_types/privatemsg_list.inc b/plugins/content_types/privatemsg_list.inc
index 7a44b88..515780e 100644
--- a/plugins/content_types/privatemsg_list.inc
+++ b/plugins/content_types/privatemsg_list.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+
 /**
  * @file
  *   TODO
@@ -15,6 +15,7 @@ $plugin = array(
   'single' => TRUE,
   'description' => t('Privatemsg TODO'),
   'category' => t('Privatemsg'),
+  'defaults' => array('list_type' => 'list'),
 );
 
 function privatemsg_panels_privatemsg_list_content_type_render($subtype, $conf, $panel_args, $context) {
@@ -31,7 +32,7 @@ function privatemsg_panels_privatemsg_list_content_type_render($subtype, $conf,
   }
 }
 
-function privatemsg_panels_privatemsg_list_content_type_edit_form(&$form, &$form_state) {
+function privatemsg_panels_privatemsg_list_content_type_edit_form($form, $form_state) {
   $conf = $form_state['conf'];
 
   $options['list'] = t('All messages');
@@ -46,6 +47,7 @@ function privatemsg_panels_privatemsg_list_content_type_edit_form(&$form, &$form
     '#description' => t('Choose which list type should be displayed'),
     '#default_value' => $conf['list_type'],
   );
+  return $form;
 }
 
 /**
diff --git a/plugins/content_types/privatemsg_new.inc b/plugins/content_types/privatemsg_new.inc
index 2749992..2556701 100644
--- a/plugins/content_types/privatemsg_new.inc
+++ b/plugins/content_types/privatemsg_new.inc
@@ -1,5 +1,5 @@
 <?php
-// $Id$
+
 /**
  * @file
  *   TODO
@@ -24,10 +24,16 @@ function privatemsg_panels_privatemsg_new_content_type_render($subtype, $conf, $
     $vars = privatemsg_panels_url_prefix_helper();
     $url_prefix_arg_count = $vars['url_prefix_arg_count'];
 
-    $recipient = arg($url_prefix_arg_count + 1);
+    $recipients = arg($url_prefix_arg_count + 1);
     $subject = arg($url_prefix_arg_count + 2);
-    $block->content = drupal_get_form('privatemsg_new', $recipient, $subject);
+    if (empty($recipients)) {
+      $recipients = array();
+    }
+    $block->content = drupal_get_form('privatemsg_new', $recipients, $subject);
     return $block;
   }
 }
 
+function privatemsg_panels_privatemsg_new_content_type_edit_form($form, $form_state) {
+  return $form;
+}
diff --git a/privatemsg_panels.info b/privatemsg_panels.info
index 0bb44d2..58b3e69 100644
--- a/privatemsg_panels.info
+++ b/privatemsg_panels.info
@@ -3,4 +3,4 @@ name = Private Message integration for panels
 dependencies[] = panels
 dependencies[] = privatemsg
 package = Mail
-core = 6.x
+core = 7.x