diff --git a/app/assets/stylesheets/mail/email.scss b/app/assets/stylesheets/mail/email.scss
index caa20499ca..5542c3d4c7 100644
--- a/app/assets/stylesheets/mail/email.scss
+++ b/app/assets/stylesheets/mail/email.scss
@@ -181,6 +181,10 @@ a {
 img.float-right {
   float: right;
   display: block;
+  max-width: 100px;
+  max-height: 100px;
+  margin-bottom: 15px;
+  margin-left: 15px;
 }
 
 del.quantity_was {
@@ -379,6 +383,10 @@ ul {
   }
 }
 
+.greeting_and_intro {
+  overflow: hidden;
+}
+
 /* Let's make sure tables in the content area are 100% wide */
 
 /* Odds and ends */
@@ -445,6 +453,7 @@ ul {
 
   img.float-right {
     float: none !important;
+    margin: 0px auto 15px;
   }
 }
 
diff --git a/app/views/shared/mailers/_greeting_and_intro.html.haml b/app/views/shared/mailers/_greeting_and_intro.html.haml
new file mode 100644
index 0000000000..0dc1719444
--- /dev/null
+++ b/app/views/shared/mailers/_greeting_and_intro.html.haml
@@ -0,0 +1,8 @@
+.greeting_and_intro
+  - if @enterprise_for_logo
+    = image_tag @enterprise_for_logo.logo_url(:medium), class: "float-right"
+
+  %h4
+    = greeting
+  %p
+    = intro