diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 1db3440..2a5571b 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -60,11 +60,13 @@ class MessagesController < ApplicationController
       @message.locked = params[:message]['locked']
       @message.sticky = params[:message]['sticky']
     end
-    if request.post? && @message.save
-      call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
-      attachments = Attachment.attach_files(@message, params[:attachments])
-      render_attachment_warning_if_needed(@message)
-      redirect_to :action => 'show', :id => @message
+    if request.post?
+      @message.save_attachments(params[:attachments])
+      if @message.save
+        call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
+        render_attachment_warning_if_needed(@message)
+        redirect_to :action => 'show', :id => @message
+      end
     end
   end
 
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index b3b0e13..2ab04b2 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -24,5 +24,5 @@
 <!--[eoform:message]-->
 
 <p><%= l(:label_attachment_plural) %><br />
-<%= render :partial => 'attachments/form' %></p>
+<%= render :partial => 'attachments/form', :locals => {:container => @message} %></p>
 </div>