diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index eeb14454..570bade5 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -437,18 +437,20 @@ class libcalendaring_itip
                 }
             }
 
-            // add input field for reply comment
-            $rsvp_buttons .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
-            $rsvp_buttons .= html::div('itip-reply-comment',
-                html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
-            );
-
             // add checkbox to suppress itip reply message
-            $rsvp_buttons .= html::label(array('class' => 'noreply-toggle'),
+            $rsvp_additions = html::label(array('class' => 'noreply-toggle'),
                 html::tag('input', array('type' => 'checkbox', 'id' => 'noreply-'.$dom_id, 'value' => 1))
                 . ' ' . $this->gettext('itipsuppressreply')
             );
 
+            // add input field for reply comment
+            $rsvp_additions .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
+            $rsvp_additions .= html::div('itip-reply-comment',
+                html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
+            );
+
+            $rsvp_buttons .= html::div('itip-reply-controls', $rsvp_additions);
+
             $buttons[] = html::div(array('id' => 'rsvp-'.$dom_id, 'class' => 'rsvp-buttons', 'style' => 'display:none'), $rsvp_buttons);
         }
         // for CANCEL messages, we can:
diff --git a/plugins/libcalendaring/localization/en_US.inc b/plugins/libcalendaring/localization/en_US.inc
index d3c9187c..505b1dc0 100644
--- a/plugins/libcalendaring/localization/en_US.inc
+++ b/plugins/libcalendaring/localization/en_US.inc
@@ -79,7 +79,7 @@ $labels['itipneeds-action'] = 'Postpone';
 $labels['itipcomment'] = 'Your response';
 $labels['itipeditresponse'] = 'Enter a response text';
 $labels['itipsendercomment'] = 'Sender\'s comment: ';
-$labels['itipsuppressreply'] = 'Don\'t send reply message';
+$labels['itipsuppressreply'] = 'Do not send a response';
 
 $labels['itipobjectnotfound'] = 'The object referred by this message was not found in your account.';
 $labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';