diff --git a/app/assets/stylesheets/new_design/flex.scss b/app/assets/stylesheets/new_design/flex.scss
index a204355e1..e61a57611 100644
--- a/app/assets/stylesheets/new_design/flex.scss
+++ b/app/assets/stylesheets/new_design/flex.scss
@@ -24,4 +24,8 @@
   &.justify-start {
     justify-content: flex-start;
   }
+
+  &.wrap {
+    flex-wrap: wrap;
+  }
 }
diff --git a/app/views/shared/dossiers/messages/_form.html.haml b/app/views/shared/dossiers/messages/_form.html.haml
index 6cc26c2bf..e6dbb38ee 100644
--- a/app/views/shared/dossiers/messages/_form.html.haml
+++ b/app/views/shared/dossiers/messages/_form.html.haml
@@ -1,6 +1,6 @@
 = form_for(commentaire, url: form_url, html: { class: 'form' }) do |f|
   = f.text_area :body, rows: 5, placeholder: 'Répondre ici', required: true, class: 'message-textarea'
-  .flex.justify-between
+  .flex.justify-between.wrap
     %div
       = f.file_field :file, id: :file, accept: commentaire.file.accept_extension_list
       %label{ for: :file }
@@ -8,4 +8,4 @@
           (taille max : 20 Mo)
 
     %div
-      = f.submit 'Envoyer', class: 'button primary send', data: { disable: true }
+      = f.submit 'Envoyer le message', class: 'button primary send', data: { disable: true }
diff --git a/spec/features/new_user/dossier_shared_examples.rb b/spec/features/new_user/dossier_shared_examples.rb
index 7ff2b8c4e..d9c36a73b 100644
--- a/spec/features/new_user/dossier_shared_examples.rb
+++ b/spec/features/new_user/dossier_shared_examples.rb
@@ -31,7 +31,7 @@ RSpec.shared_examples 'the user can send messages to the instructeur' do
     expect(page).to have_content(commentaire.body)
 
     fill_in 'commentaire_body', with: message_body
-    click_on 'Envoyer'
+    click_on 'Envoyer le message'
 
     expect(page).to have_current_path(messagerie_dossier_path(dossier))
     expect(page).to have_content('Message envoyé')