diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py
index 5c95c06f6..18745f5b2 100644
--- a/mitmproxy/web/app.py
+++ b/mitmproxy/web/app.py
@@ -363,9 +363,11 @@ class FlowContentView(RequestHandler):
 
         self.set_header("Content-Encoding", "")
 
-        description, lines  = contentviews.get_content_view_with_message_encoding(
-             message, contentviews.get(content_view.replace('_', ' '))
+        description, lines, error = contentviews.get_message_content_view(
+            contentviews.get(content_view.replace('_', ' ')), message
         )
+#        if error:
+#           add event log
 
         self.write(dict(
            lines=list(lines),
diff --git a/web/src/js/components/ContentView.jsx b/web/src/js/components/ContentView.jsx
index 9ec283cac..128d8e81a 100644
--- a/web/src/js/components/ContentView.jsx
+++ b/web/src/js/components/ContentView.jsx
@@ -39,7 +39,7 @@ function ContentView(props) {
         <div className="contentview">
             <View flow={flow} message={message} contentView={contentView} readonly={readonly} onChange={onContentChange}/>
             <ShowFullContentButton/>
-            <div className="view-options">
+            <div className="view-options footer navbar-fixed-bottom">
                 <ViewSelector message={message}/>
                 &nbsp;
                 <DownloadContentButton flow={flow} message={message}/>