diff --git a/plugins/messages/app/views/messages/new.haml b/plugins/messages/app/views/messages/new.haml
index c8787b66..8cdbbd39 100644
--- a/plugins/messages/app/views/messages/new.haml
+++ b/plugins/messages/app/views/messages/new.haml
@@ -104,7 +104,8 @@
   #messagegroup
     = f.input :messagegroup_id, :as => :select, include_blank: false, :collection => Messagegroup.undeleted.order(:name)
   #order
-    = f.input :order_id, :as => :select, include_blank: false, :collection => Order.finished_not_closed.order('pickup DESC').includes(:supplier).limit(25)
+    = f.input :order_id, :as => :select, include_blank: false, :collection => Order.finished_not_closed.order('pickup DESC').includes(:supplier).limit(25),
+        :label_method => ->(obj){ t('.order_item', supplier_name: obj.supplier.name, pickup: format_date(obj.pickup)) }, :input_html => {class: 'input-xxlarge'}
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json }
   = f.input :private, inline_label: t('.hint_private')
diff --git a/plugins/messages/config/locales/de.yml b/plugins/messages/config/locales/de.yml
index 7f491df8..41dac345 100644
--- a/plugins/messages/config/locales/de.yml
+++ b/plugins/messages/config/locales/de.yml
@@ -92,6 +92,7 @@ de:
         wiki: Wiki (Abschnitt Mailing-Liste)
       message: Nachricht
       no_user_found: Kein/e Benutzer/in gefunden
+      order_item: "%{supplier_name} (Abholung: %{pickup})"
       reply_to: Diese Nachricht ist eine Antwort auf eine andere %{link}.
       search: Suche ...
       search_user: Nach Bernutzer/in suchen
diff --git a/plugins/messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml
index 95a34234..ede3f88c 100644
--- a/plugins/messages/config/locales/en.yml
+++ b/plugins/messages/config/locales/en.yml
@@ -97,6 +97,7 @@ en:
         wiki: Wiki (page Mailing-List)
       message: message
       no_user_found: No user found
+      order_item: "%{supplier_name} (Pickup: %{pickup})"
       reply_to: This message is an reply to an other %{link}.
       search: Search ...
       search_user: Search user