diff --git a/server/templates/cloud_14_day_arrears.html b/server/templates/cloud_14_day_arrears.html
index ebd1e3dcc1..644963bdab 100644
--- a/server/templates/cloud_14_day_arrears.html
+++ b/server/templates/cloud_14_day_arrears.html
@@ -61,20 +61,28 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-50 {
-        width: 50% !important;
-        max-width: 50%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-50
+    {
+    width:50%
+    !important;
+    max-width:
+    50%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -89,266 +97,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/cloud_30_day_arrears.html b/server/templates/cloud_30_day_arrears.html
index 47ef5b5c84..60bc0f59e0 100644
--- a/server/templates/cloud_30_day_arrears.html
+++ b/server/templates/cloud_30_day_arrears.html
@@ -61,20 +61,28 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-50 {
-        width: 50% !important;
-        max-width: 50%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-50
+    {
+    width:50%
+    !important;
+    max-width:
+    50%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -89,266 +97,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/cloud_45_day_arrears.html b/server/templates/cloud_45_day_arrears.html
index bf4d45e85e..24d24203e5 100644
--- a/server/templates/cloud_45_day_arrears.html
+++ b/server/templates/cloud_45_day_arrears.html
@@ -61,20 +61,28 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-50 {
-        width: 50% !important;
-        max-width: 50%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-50
+    {
+    width:50%
+    !important;
+    max-width:
+    50%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -89,266 +97,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/cloud_7_day_arrears.html b/server/templates/cloud_7_day_arrears.html
index 70230a6157..a1da6ccd0d 100644
--- a/server/templates/cloud_7_day_arrears.html
+++ b/server/templates/cloud_7_day_arrears.html
@@ -61,20 +61,28 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-50 {
-        width: 50% !important;
-        max-width: 50%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-50
+    {
+    width:50%
+    !important;
+    max-width:
+    50%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -89,266 +97,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/cloud_90_day_arrears.html b/server/templates/cloud_90_day_arrears.html
index 2a5ac6913f..3166b5ac2c 100644
--- a/server/templates/cloud_90_day_arrears.html
+++ b/server/templates/cloud_90_day_arrears.html
@@ -61,20 +61,28 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-50 {
-        width: 50% !important;
-        max-width: 50%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-50
+    {
+    width:50%
+    !important;
+    max-width:
+    50%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -89,266 +97,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/cloud_renewal_notification.html b/server/templates/cloud_renewal_notification.html
index 0977a8844b..bb3ce402c0 100644
--- a/server/templates/cloud_renewal_notification.html
+++ b/server/templates/cloud_renewal_notification.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/cloud_upgrade_confirmation.html b/server/templates/cloud_upgrade_confirmation.html
index f676b61c46..63ce535629 100644
--- a/server/templates/cloud_upgrade_confirmation.html
+++ b/server/templates/cloud_upgrade_confirmation.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/invite_body.html b/server/templates/invite_body.html
index dc6fe22076..23e6791a00 100644
--- a/server/templates/invite_body.html
+++ b/server/templates/invite_body.html
@@ -61,25 +61,35 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-33-333333333333336 {
-        width: 33.333333333333336% !important;
-        max-width: 33.333333333333336%;
-      }
-
-      .mj-column-per-90 {
-        width: 90% !important;
-        max-width: 90%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-33-333333333333336
+    {
+    width:33.333333333333336%
+    !important;
+    max-width:
+    33.333333333333336%;
+    }
+    .mj-column-per-90
+    {
+    width:90%
+    !important;
+    max-width:
+    90%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -99,266 +109,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/ip_filters_changed.html b/server/templates/ip_filters_changed.html
index 7d71323c55..9f73ca2cf8 100644
--- a/server/templates/ip_filters_changed.html
+++ b/server/templates/ip_filters_changed.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/license_up_for_renewal.html b/server/templates/license_up_for_renewal.html
index d9daa4cce4..f0f880ba07 100644
--- a/server/templates/license_up_for_renewal.html
+++ b/server/templates/license_up_for_renewal.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/messages_notification.html b/server/templates/messages_notification.html
index ba94db3b3e..1157aaa4cb 100644
--- a/server/templates/messages_notification.html
+++ b/server/templates/messages_notification.html
@@ -61,25 +61,35 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-33-333333333333336 {
-        width: 33.333333333333336% !important;
-        max-width: 33.333333333333336%;
-      }
-
-      .mj-column-per-90 {
-        width: 90% !important;
-        max-width: 90%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-33-333333333333336
+    {
+    width:33.333333333333336%
+    !important;
+    max-width:
+    33.333333333333336%;
+    }
+    .mj-column-per-90
+    {
+    width:90%
+    !important;
+    max-width:
+    90%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -99,418 +109,846 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
+    }
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
+    }
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
+    }
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
+    }
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
+    }
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
+    }
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
+    }
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
+    }
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    }
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
+    }
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
+    }
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
+    }
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
+    }
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
+    }
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
+    }
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
+    }
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
+    }
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    }
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
+    }
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
+    }
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
+    }
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
+    }
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
+    }
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    .divider
+    {
+    opacity:
+    12%;
+    }
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
+    }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
 
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .messageAttachments
+    *
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .messageAttachmentContent
+    {
+    padding:
+    0px;
+    border:
+    1px
+    solid
+    rgba(63,
+    67,
+    80,
+    0.16);
+    margin-bottom:
+    20px;
+    border-radius:
+    0
+    4px
+    4px
+    0;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .messageAttachmentContent
+    >
+    table,
+    .attachment__body
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left;
+    font-size:
+    14px;
+    line-height:
+    20px;
+    color:
+    #3F4350;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .messageAttachmentContent
+    .attachment__author-icon
+    {
+    width:
+    14px;
+    height:
+    14px;
+    margin-right:
+    5px;
+    border-radius:
+    50px;
+    vertical-align:
+    middle;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .attachment__author-name
+    {
+    opacity:
+    0.6;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageAttachmentContent
+    p
+    {
+    margin:
+    0;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .attachment__title
+    {
+    padding:
+    0;
+    margin:
+    5px
+    0;
+    font-size:
+    14px;
+    font-weight:
+    600;
+    line-height:
+    18px;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .attachment__image
+    {
+    max-height:
+    300px;
+    border:
+    1px
+    solid
+    transparent;
+    margin-bottom:
+    1em;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .attachment__thumb-image
+    {
+    max-width:
+    100%;
+    max-height:
+    75px;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .attachment__thumb-container
+    {
+    max-width:
+    80px;
+    width:
+    max-content;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .attachment__wrapper
+    {
+    width:
+    100%;
+    display:
+    flex;
+    flex-direction:
+    row;
+    gap:
+    12px;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .attachment__body
+    {
+    flex:
+    1;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .messageAttachmentContent
+    >
+    table.attachment__footer-container
+    {
+    color:
+    #a3a3a3;
+    font-size:
+    12px;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .attachment__footer-icon
+    {
+    width:
+    16px;
+    height:
+    16px;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .attachment__footer-container
+    {
+    color:
+    #a3a3a3;
+    font-size:
+    12px;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAttachment_title
+    {
+    padding-top:
+    1em;
+    font-weight:
+    600;
+    margin-bottom:
+    4px;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .pretext
+    h1
+    {
+    font-size:
+    28px;
+    line-height:
+    32px;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .pretext
+    h2
+    {
+    font-size:
+    25px;
+    line-height:
+    30px;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .pretext
+    h3
+    {
+    font-size:
+    22px;
+    line-height:
+    25px;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .pretext
+    h4
+    {
+    font-size:
+    19px;
+    line-height:
+    24px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .pretext
+    h5
+    {
+    font-size:
+    15px;
+    line-height:
+    20px;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .pretext
+    h6
+    {
+    font-size:
+    1em;
+    line-height:
+    1.4em;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .pretext
+    >
+    *
+    {
+    margin-bottom:
+    16px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .messageAttachments
+    {
+    margin-top:
+    22px;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
-    }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
-    }
-
-    .divider {
-      opacity: 12%;
-    }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
-    }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
-    }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
-    }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
-    }
-
-    .messageAttachments * {
-      font-family: Open Sans, sans-serif !important;
-    }
-
-    .messageAttachmentContent {
-      padding: 0px;
-      border: 1px solid rgba(63, 67, 80, 0.16);
-      margin-bottom: 20px;
-      border-radius: 0 4px 4px 0;
-    }
-
-    .messageAttachmentContent>table,
-    .attachment__body {
-      font-family: Open Sans, sans-serif;
-      text-align: left;
-      font-size: 14px;
-      line-height: 20px;
-      color: #3F4350;
-    }
-
-    .messageAttachmentContent .attachment__author-icon {
-      width: 14px;
-      height: 14px;
-      margin-right: 5px;
-      border-radius: 50px;
-      vertical-align: middle;
-    }
-
-    .attachment__author-name {
-      opacity: 0.6;
-    }
-
-    .messageAttachmentContent p {
-      margin: 0;
-    }
-
-    .attachment__title {
-      padding: 0;
-      margin: 5px 0;
-      font-size: 14px;
-      font-weight: 600;
-      line-height: 18px;
-    }
-
-    .attachment__image {
-      max-height: 300px;
-      border: 1px solid transparent;
-      margin-bottom: 1em;
-    }
-
-    .attachment__thumb-image {
-      max-width: 100%;
-      max-height: 75px;
-    }
-
-    .attachment__thumb-container {
-      max-width: 80px;
-      width: max-content;
-    }
-
-    .attachment__wrapper {
-      width: 100%;
-      display: flex;
-      flex-direction: row;
-      gap: 12px;
-    }
-
-    .attachment__body {
-      flex: 1;
-    }
-
-    .messageAttachmentContent>table.attachment__footer-container {
-      color: #a3a3a3;
-      font-size: 12px;
-    }
-
-    .attachment__footer-icon {
-      width: 16px;
-      height: 16px;
-    }
-
-    .attachment__footer-container {
-      color: #a3a3a3;
-      font-size: 12px;
-    }
-
-    .messageAttachment_title {
-      padding-top: 1em;
-      font-weight: 600;
-      margin-bottom: 4px;
-    }
-
-    .pretext h1 {
-      font-size: 28px;
-      line-height: 32px;
-    }
-
-    .pretext h2 {
-      font-size: 25px;
-      line-height: 30px;
-    }
-
-    .pretext h3 {
-      font-size: 22px;
-      line-height: 25px;
-    }
-
-    .pretext h4 {
-      font-size: 19px;
-      line-height: 24px;
-    }
-
-    .pretext h5 {
-      font-size: 15px;
-      line-height: 20px;
-    }
-
-    .pretext h6 {
-      font-size: 1em;
-      line-height: 1.4em;
-    }
-
-    .pretext>* {
-      margin-bottom: 16px;
-    }
-
-    .messageAttachments {
-      margin-top: 22px;
-    }
-
-    .messageAttachments h1,
+    .messageAttachments
+    h1,
     h2,
     h3,
     h4,
     h5,
-    h6 {
-      font-weight: 500;
+    h6
+    {
+    font-weight:
+    500;
     }
-
-    code {
-      padding: 2px 4px;
-      font-size: 90%;
-      background-color: rgba(63, 67, 80, 0.1);
-      border-radius: 4px;
+    code
+    {
+    padding:
+    2px
+    4px;
+    font-size:
+    90%;
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.1);
+    border-radius:
+    4px;
     }
-
-    .messageAttachments a {
-      background-color: unset !important;
-      border: none !important;
-      padding: unset !important;
+    .messageAttachments
+    a
+    {
+    background-color:
+    unset
+    !important;
+    border:
+    none
+    !important;
+    padding:
+    unset
+    !important;
     }
   </style>
   <!-- this empty mj attribute tag is required by MJML to compile successfully -->
diff --git a/server/templates/payment_failed_body.html b/server/templates/payment_failed_body.html
index 97cdea917a..7b1ca2713e 100644
--- a/server/templates/payment_failed_body.html
+++ b/server/templates/payment_failed_body.html
@@ -61,20 +61,28 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
 
-      .mj-column-per-50 {
-        width: 50% !important;
-        max-width: 50%;
-      }
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
+    .mj-column-per-50
+    {
+    width:50%
+    !important;
+    max-width:
+    50%;
+    }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -89,266 +97,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/reset_body.html b/server/templates/reset_body.html
index 3ead187da7..17afcb7022 100644
--- a/server/templates/reset_body.html
+++ b/server/templates/reset_body.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/verify_body.html b/server/templates/verify_body.html
index aeeb616400..84b4a63986 100644
--- a/server/templates/verify_body.html
+++ b/server/templates/verify_body.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>
diff --git a/server/templates/welcome_body.html b/server/templates/welcome_body.html
index fc8732dbc3..406dc23064 100644
--- a/server/templates/welcome_body.html
+++ b/server/templates/welcome_body.html
@@ -61,15 +61,21 @@
   <!--[if !mso]><!-->
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700" rel="stylesheet" type="text/css">
   <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
+  @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,700);
+        </style>
+      <!--<![endif]-->
+
+    
+        
+    <style type="text/css">
+      @media only screen and (min-width:480px) {
+      .mj-column-per-100
+      {
+      width:100%
+      !important;
+      max-width:
+      100%;
+  }
     }
   </style>
   <style media="screen and (min-width:480px)">
@@ -79,266 +85,588 @@
     }
   </style>
   <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
+  @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile
+      {
+      width:
+      100%
+      !important;
+  }
+    td.mj-full-width-mobile
+    {
+    width:
+    auto
+    !important;
+    }
     }
   </style>
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+  <style type="text/css">@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
 
-    .emailBody {
-      background-color: #F3F3F3
+.emailBody {
+      background-color:
+      #F3F3F3
+  }
+    .emailBody
+    a {
+    text-decoration:
+    none
+    !important;
+    color:
+    #1C58D9;
     }
-
-    .emailBody a {
-      text-decoration: none !important;
-      color: #1C58D9;
+    .title
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    28px
+    !important;
+    line-height:
+    36px
+    !important;
+    letter-spacing:
+    -0.01em
+    !important;
+    color:
+    #3F4350
+    !important;
+    font-family:
+    Open
+    Sans,
+    sans-serif
+    !important;
     }
-
-    .title div {
-      font-weight: 600 !important;
-      font-size: 28px !important;
-      line-height: 36px !important;
-      letter-spacing: -0.01em !important;
-      color: #3F4350 !important;
-      font-family: Open Sans, sans-serif !important;
+    .subTitle
+    div
+    {
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64)
+    !important;
     }
-
-    .subTitle div {
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: rgba(63, 67, 80, 0.64) !important;
+    .subTitle
+    a
+    {
+    color:
+    rgb(28,
+    88,
+    217)
+    !important;
     }
-
-    .subTitle a {
-      color: rgb(28, 88, 217) !important;
+    .button
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button a {
-      background-color: #1C58D9 !important;
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .button-cloud
+    a
+    {
+    background-color:
+    #1C58D9
+    !important;
+    font-weight:
+    400
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    18px
+    !important;
+    color:
+    #FFFFFF
+    !important;
+    padding:
+    15px
+    24px
+    !important;
     }
-
-    .button-cloud a {
-      background-color: #1C58D9 !important;
-      font-weight: 400 !important;
-      font-size: 16px !important;
-      line-height: 18px !important;
-      color: #FFFFFF !important;
-      padding: 15px 24px !important;
+    .messageButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #FFFFFF
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    12px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .messageButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #FFFFFF !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 12px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .info
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    40px
+    0px
+    !important;
     }
-
-    .info div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 40px 0px !important;
+    .footerTitle
+    div
+    {
+    font-weight:
+    600
+    !important;
+    font-size:
+    16px
+    !important;
+    line-height:
+    24px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
     }
-
-    .footerTitle div {
-      font-weight: 600 !important;
-      font-size: 16px !important;
-      line-height: 24px !important;
-      color: #3F4350 !important;
-      padding: 0px 0px 4px 0px !important;
+    .footerInfo
+    div
+    {
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    48px
+    0px
+    48px
+    !important;
     }
-
-    .footerInfo div {
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px 48px 0px 48px !important;
+    .footerInfo
+    a
+    {
+    color:
+    #1C58D9
+    !important;
     }
-
-    .footerInfo a {
-      color: #1C58D9 !important;
+    .appDownloadButton
+    a {
+    background-color:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    #1C58D9
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    color:
+    #1C58D9
+    !important;
+    padding:
+    13px
+    20px
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    14px
+    !important;
     }
-
-    .appDownloadButton a {
-      background-color: #FFFFFF !important;
-      border: 1px solid #1C58D9 !important;
-      box-sizing: border-box !important;
-      color: #1C58D9 !important;
-      padding: 13px 20px !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 14px !important;
+    .emailFooter
+    div
+    {
+    font-size:
+    12px
+    !important;
+    line-height:
+    16px
+    !important;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56)
+    !important;
+    padding:
+    8px
+    24px
+    8px
+    24px
+    !important;
     }
-
-    .emailFooter div {
-      font-size: 12px !important;
-      line-height: 16px !important;
-      color: rgba(63, 67, 80, 0.56) !important;
-      padding: 8px 24px 8px 24px !important;
+    .postCard
+    {
+    padding:
+    0px
+    24px
+    40px
+    24px
+    !important;
     }
-
-    .postCard {
-      padding: 0px 24px 40px 24px !important;
+    .messageCard
+    {
+    background:
+    #FFFFFF
+    !important;
+    border:
+    1px
+    solid
+    rgba(61,
+    60,
+    64,
+    0.08)
+    !important;
+    box-sizing:
+    border-box
+    !important;
+    box-shadow:
+    0px
+    8px
+    24px
+    rgba(0,
+    0,
+    0,
+    0.12)
+    !important;
+    border-radius:
+    4px
+    !important;
+    padding:
+    32px
+    !important;
     }
-
-    .messageCard {
-      background: #FFFFFF !important;
-      border: 1px solid rgba(61, 60, 64, 0.08) !important;
-      box-sizing: border-box !important;
-      box-shadow: 0px 8px 24px rgba(0, 0, 0, 0.12) !important;
-      border-radius: 4px !important;
-      padding: 32px !important;
+    .messageAvatar
+    img
+    {
+    width:
+    32px
+    !important;
+    height:
+    32px
+    !important;
+    padding:
+    0px
+    !important;
+    border-radius:
+    32px
+    !important;
     }
-
-    .messageAvatar img {
-      width: 32px !important;
-      height: 32px !important;
-      padding: 0px !important;
-      border-radius: 32px !important;
+    .messageAvatarCol
+    {
+    width:
+    32px
+    !important;
     }
-
-    .messageAvatarCol {
-      width: 32px !important;
+    .postNameAndTime
+    {
+    padding:
+    0px
+    0px
+    4px
+    0px
+    !important;
+    display:
+    flex;
     }
-
-    .postNameAndTime {
-      padding: 0px 0px 4px 0px !important;
-      display: flex;
+    .senderName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    text-align:
+    left
+    !important;
+    font-weight:
+    600
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
     }
-
-    .senderName {
-      font-family: Open Sans, sans-serif;
-      text-align: left !important;
-      font-weight: 600 !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
+    .time
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-size:
+    12px;
+    line-height:
+    16px;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.56);
+    padding:
+    2px
+    6px;
+    align-items:
+    center;
+    float:
+    left;
     }
-
-    .time {
-      font-family: Open Sans, sans-serif;
-      font-size: 12px;
-      line-height: 16px;
-      color: rgba(63, 67, 80, 0.56);
-      padding: 2px 6px;
-      align-items: center;
-      float: left;
+    .channelBg
+    {
+    background:
+    rgba(63,
+    67,
+    80,
+    0.08);
+    border-radius:
+    4px;
+    display:
+    flex;
+    padding-left:
+    4px;
     }
-
-    .channelBg {
-      background: rgba(63, 67, 80, 0.08);
-      border-radius: 4px;
-      display: flex;
-      padding-left: 4px;
+    .channelLogo
+    {
+    width:
+    10px;
+    height:
+    10px;
+    padding:
+    5px
+    4px
+    5px
+    6px;
+    float:
+    left;
     }
-
-    .channelLogo {
-      width: 10px;
-      height: 10px;
-      padding: 5px 4px 5px 6px;
-      float: left;
+    .channelName
+    {
+    font-family:
+    Open
+    Sans,
+    sans-serif;
+    font-weight:
+    600;
+    font-size:
+    10px;
+    line-height:
+    16px;
+    letter-spacing:
+    0.01em;
+    text-transform:
+    uppercase;
+    color:
+    rgba(63,
+    67,
+    80,
+    0.64);
+    padding:
+    2px
+    6px
+    2px
+    0px;
     }
-
-    .channelName {
-      font-family: Open Sans, sans-serif;
-      font-weight: 600;
-      font-size: 10px;
-      line-height: 16px;
-      letter-spacing: 0.01em;
-      text-transform: uppercase;
-      color: rgba(63, 67, 80, 0.64);
-      padding: 2px 6px 2px 0px;
+    .gmChannelCount
+    {
+    background-color:
+    rgba(63,
+    67,
+    80,
+    0.2);
+    padding:
+    0
+    5px;
+    border-radius:
+    2px;
+    margin-right:
+    2px;
     }
-
-    .gmChannelCount {
-      background-color: rgba(63, 67, 80, 0.2);
-      padding: 0 5px;
-      border-radius: 2px;
-      margin-right: 2px;
+    .senderMessage
+    div
+    {
+    text-align:
+    left
+    !important;
+    font-size:
+    14px
+    !important;
+    line-height:
+    20px
+    !important;
+    color:
+    #3F4350
+    !important;
+    padding:
+    0px
+    !important;
     }
-
-    .senderMessage div {
-      text-align: left !important;
-      font-size: 14px !important;
-      line-height: 20px !important;
-      color: #3F4350 !important;
-      padding: 0px !important;
+    .senderInfoCol
+    {
+    width:
+    394px
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    .senderInfoCol {
-      width: 394px !important;
-      padding: 0px 0px 0px 12px !important;
+    .divider
+    {
+    opacity:
+    12%;
     }
-
-    .divider {
-      opacity: 12%;
+  @media all and (min-width: 541px) {
+      .emailBody
+      {
+      padding:
+      32px
+      !important;
+  }
     }
-
-    @media all and (min-width: 541px) {
-      .emailBody {
-        padding: 32px !important;
-      }
+  @media all and (max-width: 540px) and (min-width: 401px) {
+      .emailBody
+      {
+      padding:
+      16px
+      !important;
+  }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
     }
-
-    @media all and (max-width: 540px) and (min-width: 401px) {
-      .emailBody {
-        padding: 16px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
     }
-
-    @media all and (max-width: 400px) {
-      .emailBody {
-        padding: 0px !important;
-      }
-
-      .footerInfo div {
-        padding: 0px !important;
-      }
-
-      .messageCard {
-        padding: 16px !important;
-      }
-
-      .postCard {
-        padding: 0px 0px 40px 0px !important;
-      }
-
-      .senderInfoCol {
-        width: 80% !important;
-        padding: 0px 0px 0px 12px !important;
-      }
     }
-
-    @media only screen and (min-width:480px) {
-      .mj-column-per-50 {
-        width: 100% !important;
-        max-width: 100% !important;
-      }
+  @media all and (max-width: 400px) {
+      .emailBody
+      {
+      padding:
+      0px
+      !important;
+  }
+    .footerInfo
+    div
+    {
+    padding:
+    0px
+    !important;
+    }
+    .messageCard
+    {
+    padding:
+    16px
+    !important;
+    }
+    .postCard
+    {
+    padding:
+    0px
+    0px
+    40px
+    0px
+    !important;
+    }
+    .senderInfoCol
+    {
+    width:
+    80%
+    !important;
+    padding:
+    0px
+    0px
+    0px
+    12px
+    !important;
+    }
+    }
+  @media only screen and (min-width:480px) {
+      .mj-column-per-50
+      {
+      width:
+      100%
+      !important;
+      max-width:
+      100%
+      !important;
+  }
     }
   </style>
 </head>