diff --git a/apps/regression/graph_options_controller.cpp b/apps/regression/graph_options_controller.cpp
index 2e2567a33..de03068a1 100644
--- a/apps/regression/graph_options_controller.cpp
+++ b/apps/regression/graph_options_controller.cpp
@@ -16,7 +16,6 @@ GraphOptionsController::GraphOptionsController(Responder * parentResponder, Inpu
   m_store(store),
   m_graphController(graphController)
 {
-  static_cast<ExpressionView *>(m_changeRegressionCell.subAccessoryView())->setHorizontalMargin(Metric::ExpressionViewHorizontalMargin);
 }
 
 const char * GraphOptionsController::title() {
diff --git a/apps/regression/store_parameter_controller.cpp b/apps/regression/store_parameter_controller.cpp
index 322c71bd7..e06c2b859 100644
--- a/apps/regression/store_parameter_controller.cpp
+++ b/apps/regression/store_parameter_controller.cpp
@@ -10,7 +10,6 @@ StoreParameterController::StoreParameterController(Responder * parentResponder,
   m_changeRegressionCell(I18n::Message::Regression),
   m_lastSelectionIsRegression(false)
 {
-  static_cast<ExpressionView *>(m_changeRegressionCell.subAccessoryView())->setHorizontalMargin(Metric::ExpressionViewHorizontalMargin);
 }
 
 void StoreParameterController::viewWillAppear() {
diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp
index c508c36d0..56850b68f 100644
--- a/apps/sequence/list/list_parameter_controller.cpp
+++ b/apps/sequence/list/list_parameter_controller.cpp
@@ -15,7 +15,6 @@ ListParameterController::ListParameterController(::InputEventHandlerDelegate * i
   m_typeParameterController(this, listController, TableCell::Layout::Horizontal, Metric::CommonTopMargin, Metric::CommonRightMargin,
     Metric::CommonBottomMargin, Metric::CommonLeftMargin)
 {
-  static_cast<ExpressionView *>(m_typeCell.subAccessoryView())->setHorizontalMargin(Metric::ExpressionViewHorizontalMargin);
 }
 
 const char * ListParameterController::title() {
diff --git a/escher/src/message_table_cell_with_chevron_and_expression.cpp b/escher/src/message_table_cell_with_chevron_and_expression.cpp
index a2288c05b..01af387dd 100644
--- a/escher/src/message_table_cell_with_chevron_and_expression.cpp
+++ b/escher/src/message_table_cell_with_chevron_and_expression.cpp
@@ -1,10 +1,12 @@
 #include <escher/message_table_cell_with_chevron_and_expression.h>
+#include <escher/metric.h>
 #include <escher/palette.h>
 
 MessageTableCellWithChevronAndExpression::MessageTableCellWithChevronAndExpression(I18n::Message message, const KDFont * font) :
   MessageTableCellWithChevron(message, font),
   m_subtitleView(1.0f, 0.5f, Palette::GreyDark)
 {
+  m_subtitleView.setHorizontalMargin(Metric::ExpressionViewHorizontalMargin);
 }
 
 View * MessageTableCellWithChevronAndExpression::subAccessoryView() const {