diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 8f637a0e7c..96099c9358 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -109,10 +109,10 @@ var people_list = {{ people }};
                                             </td>
                                             <td class="messagebox compose">
                                                 <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon"/>
-                                                <p class="zephyr_text">
-                                                <textarea class="zephyr_message" name="new_zephyr" id="new_zephyr" value="" placeholder="Compose your message here..."/></textarea>
-                                                <input type="submit" value="Send" class="btn send_zephyr"/>
-                                                </p>
+                                                <div class="zephyr_content">
+                                                    <textarea class="zephyr_message" name="new_zephyr" id="new_zephyr" value="" placeholder="Compose your message here..."/></textarea>
+                                                    <input type="submit" value="Send" class="btn send_zephyr"/>
+                                                </div>
                                             </td>
                                         </tr>
                                     </tbody>
@@ -138,10 +138,10 @@ var people_list = {{ people }};
                                             <td class="zephyr_recipient"></td>
                                             <td class="messagebox compose">
                                                 <img class="profile_picture" src="http://www.gravatar.com/avatar/a?d=identicon"/>
-                                                <p class="zephyr_text">
-                                                <textarea class="zephyr_message" name="new_zephyr" id="new_personal_zephyr" value="" placeholder="Compose your message here..."/></textarea>
-                                                <input type="submit" name="personal_zephyr" value="Send" class="btn send_zephyr"/>
-                                                </p>
+                                                <div class="zephyr_content">
+                                                    <textarea class="zephyr_message" name="new_zephyr" id="new_personal_zephyr" value="" placeholder="Compose your message here..."/></textarea>
+                                                    <input type="submit" name="personal_zephyr" value="Send" class="btn send_zephyr"/>
+                                                </div>
                                             </td>
                                         </tr>
                                     </tbody>