diff --git a/tailbone/templates/settings/email/view.mako b/tailbone/templates/settings/email/view.mako
index fa3cb142..a5ce192b 100644
--- a/tailbone/templates/settings/email/view.mako
+++ b/tailbone/templates/settings/email/view.mako
@@ -1,8 +1,9 @@
 ## -*- coding: utf-8; -*-
 <%inherit file="/master/view.mako" />
 
-<%def name="head_tags()">
-  ${parent.head_tags()}
+<%def name="extra_javascript()">
+  ${parent.extra_javascript()}
+  % if not use_buefy:
   <script type="text/javascript">
     % if not email.get_template('html'):
       $(function() {
@@ -17,16 +18,80 @@
       });
     % endif
   </script>
+  % endif
 </%def>
 
 ${parent.body()}
 
-${h.form(url('email.preview'), name='send-email-preview', class_='autodisable')}
-  ${h.csrf_token(request)}
-  ${h.hidden('email_key', value=instance['key'])}
-  ${h.link_to("Preview HTML", '{}?key={}&type=html'.format(url('email.preview'), instance['key']), id='preview-html', class_='button', target='_blank')}
-  ${h.link_to("Preview TXT", '{}?key={}&type=txt'.format(url('email.preview'), instance['key']), id='preview-txt', class_='button', target='_blank')}
-  or
-  ${h.text('recipient', value=request.user.email_address or '')}
-  ${h.submit('send_{}'.format(instance['key']), value="Send Preview Email")}
-${h.end_form()}
+% if use_buefy:
+
+    ${h.form(url('email.preview'))}
+      ${h.csrf_token(request)}
+      ${h.hidden('email_key', value=instance['key'])}
+
+      <div class="field is-grouped">
+
+        <div class="control">
+          % if email.get_template('html'):
+              <a class="button"
+                 href="${url('email.preview')}?key=${instance['key']}&type=html"
+                 target="_blank">
+                Preview HTML
+              </a>
+          % else:
+              <button class="button"
+                      type="button"
+                      title="There is no HTML template on file for this email."
+                      disabled>
+                Preview HTML
+              </button>
+          % endif
+        </div>
+
+        <div class="control">
+        % if email.get_template('txt'):
+            <a class="button"
+               href="${url('email.preview')}?key=${instance['key']}&type=txt"
+               target="_blank">
+              Preview TXT
+            </a>
+        % else:
+            <button class="button"
+                    type="button"
+                    title="There is no TXT template on file for this email."
+                    disabled>
+              Preview TXT
+            </button>
+        % endif
+        </div>
+
+        <div class="control">
+          or
+        </div>
+
+        <div class="control">
+          <input name="recipient" type="email" class="input" value="${request.user.email_address or ''}" />
+        </div>
+
+        <div class="control">
+          <input type="submit" class="button" name="send_${instance['key']}" value="Send Preview Email" />
+        </div>
+
+      </div><!-- field -->
+
+    ${h.end_form()}
+
+% else:
+    ## not buefy; do traditional thing
+
+    ${h.form(url('email.preview'), name='send-email-preview', class_='autodisable')}
+      ${h.csrf_token(request)}
+      ${h.hidden('email_key', value=instance['key'])}
+      ${h.link_to("Preview HTML", '{}?key={}&type=html'.format(url('email.preview'), instance['key']), id='preview-html', class_='button', target='_blank')}
+      ${h.link_to("Preview TXT", '{}?key={}&type=txt'.format(url('email.preview'), instance['key']), id='preview-txt', class_='button', target='_blank')}
+      or
+      ${h.text('recipient', value=request.user.email_address or '')}
+      ${h.submit('send_{}'.format(instance['key']), value="Send Preview Email")}
+    ${h.end_form()}
+
+% endif
diff --git a/tailbone/templates/themes/falafel/base.mako b/tailbone/templates/themes/falafel/base.mako
index 7b7c4473..19ba92ed 100644
--- a/tailbone/templates/themes/falafel/base.mako
+++ b/tailbone/templates/themes/falafel/base.mako
@@ -318,8 +318,8 @@
   ## Bulma 0.7.4
   ${h.stylesheet_link('https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.4/css/bulma.min.css')}
 
-  ## Buefy 0.7.3
-  ${h.stylesheet_link('https://unpkg.com/buefy@0.7.3/dist/buefy.min.css')}
+  ## Buefy 0.7.4
+  ${h.stylesheet_link('https://unpkg.com/buefy@0.7.4/dist/buefy.min.css')}
 
 ##   ${self.jquery_theme()}
 ##   ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.loadmask.css'))}
diff --git a/tailbone/views/master.py b/tailbone/views/master.py
index c7ae41d2..0f15ee2e 100644
--- a/tailbone/views/master.py
+++ b/tailbone/views/master.py
@@ -294,7 +294,6 @@ class MasterView(View):
 
         context = {
             'grid': grid,
-            'use_buefy': use_buefy,
         }
         return self.render_to_response('index', context)
 
@@ -2088,6 +2087,7 @@ class MasterView(View):
         """
         context = {
             'master': self,
+            'use_buefy': self.get_use_buefy(),
             'mobile': mobile,
             'model_title': self.get_model_title(),
             'model_title_plural': self.get_model_title_plural(),