Fix direct addressing of messages

2 files changed, 2 insertions, 4 deletions

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 38e70c90d..f83015a37 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -201,7 +201,7 @@ class NewmessageAction extends Action
 
     function showNoticeForm()
     {
-        $message_form = new MessageForm($this);
+        $message_form = new MessageForm($this, $this->to, $this->content);
         $message_form->show();
     }
 }
diff --git a/lib/messageform.php b/lib/messageform.php
index 61d3d75af..f41508305 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -99,7 +99,6 @@ class MessageForm extends Form
         return common_local_url('newmessage');
     }
 
-
     /**
      * Legend of the Form
      *
@@ -110,7 +109,6 @@ class MessageForm extends Form
         $this->out->element('legend', null, _('Send a direct notice'));
     }
 
-
     /**
      * Data elements
      *
@@ -137,7 +135,7 @@ class MessageForm extends Form
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li', array('id' => 'notice_to'));
         $this->out->dropdown('to', _('To'), $mutual, null, false,
-                             $this->to->id);
+                             ($this->to) ? $this->to->id : null);
         $this->out->elementEnd('li');
 
         $this->out->elementStart('li', array('id' => 'notice_text'));