More whitespace cleanup.

8 files changed, 557 insertions, 557 deletions

diff --git a/mail/e-mail-tab-picker.c b/mail/e-mail-tab-picker.c
index 5137a0c5ed..e97bc742df 100644
--- a/mail/e-mail-tab-picker.c
+++ b/mail/e-mail-tab-picker.c
@@ -146,30 +146,30 @@ e_mail_tab_picker_drop (MxDroppable         *droppable,
 
       /* Ignore docked tabs */
       if (!props->docked)
-        {
+	{
           /* If the tab is beyond the dragged tab and not draggable,
            * we don't want to drag past it.
            */
-          if ((event_x >= props->position + priv->scroll_offset) &&
-              (tab->position + tab->width <= props->position) &&
-              !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab)))
-            {
-              new_position--;
-              break;
-            }
+	  if ((event_x >= props->position + priv->scroll_offset) &&
+	      (tab->position + tab->width <= props->position) &&
+	      !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab)))
+	    {
+	      new_position--;
+	      break;
+	    }
 
           /* The same check for dragging left instead of right */
-          if ((event_x < props->position + props->width + priv->scroll_offset)&&
-              (tab->position >= props->position) &&
-              !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab)))
-            break;
+	  if ((event_x < props->position + props->width + priv->scroll_offset)&&
+	      (tab->position >= props->position) &&
+	      !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab)))
+	    break;
 
           /* If the tab-end position is after the drop position,
            * break - we want to drop before here.
            */
-          if (props->position + props->width + priv->scroll_offset > event_x)
-            break;
-        }
+	  if (props->position + props->width + priv->scroll_offset > event_x)
+	    break;
+	}
 
       /* Increment the position */
       new_position++;
@@ -309,14 +309,14 @@ e_mail_tab_picker_paint (ClutterActor *actor)
       EMailTabPickerProps *props = t->data;
 
       if (props->docked)
-        continue;
+	continue;
       if (props->position + props->width < offset)
-        continue;
+	continue;
       if (props->position > width + offset)
-        break;
+	break;
 
       if (CLUTTER_ACTOR_IS_MAPPED (props->tab))
-        clutter_actor_paint (CLUTTER_ACTOR (props->tab));
+	clutter_actor_paint (CLUTTER_ACTOR (props->tab));
     }
 
   cogl_translate (priv->scroll_offset, 0, 0);
@@ -325,15 +325,15 @@ e_mail_tab_picker_paint (ClutterActor *actor)
   if (priv->docked_tabs)
     {
       for (t = priv->tabs; t; t = t->next)
-        {
-          EMailTabPickerProps *props = t->data;
+	{
+	  EMailTabPickerProps *props = t->data;
 
-          if (!props->docked)
-            continue;
+	  if (!props->docked)
+	    continue;
 
-          if (CLUTTER_ACTOR_IS_MAPPED (props->tab))
-            clutter_actor_paint (CLUTTER_ACTOR (props->tab));
-        }
+	  if (CLUTTER_ACTOR_IS_MAPPED (props->tab))
+	    clutter_actor_paint (CLUTTER_ACTOR (props->tab));
+	}
     }
 
   cogl_clip_pop ();
@@ -347,16 +347,16 @@ e_mail_tab_picker_paint (ClutterActor *actor)
     {
       gfloat height;
       clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->close_button),
-                                          -1, NULL, &height);
+					  -1, NULL, &height);
       height *= priv->preview_progress;
       if (height >= 1.0)
-        {
-          cogl_clip_push_rectangle (0, 0, width, height);
-          if (CLUTTER_ACTOR_IS_MAPPED (priv->close_button))
-            clutter_actor_paint (CLUTTER_ACTOR (priv->close_button));
-          clutter_actor_paint (CLUTTER_ACTOR (priv->scroll_bar));
-          cogl_clip_pop ();
-        }
+	{
+	  cogl_clip_push_rectangle (0, 0, width, height);
+	  if (CLUTTER_ACTOR_IS_MAPPED (priv->close_button))
+	    clutter_actor_paint (CLUTTER_ACTOR (priv->close_button));
+	  clutter_actor_paint (CLUTTER_ACTOR (priv->scroll_bar));
+	  cogl_clip_pop ();
+	}
     }
 }
 
@@ -385,7 +385,7 @@ e_mail_tab_picker_get_preferred_width (ClutterActor *actor,
   EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv;
 
   clutter_actor_get_preferred_width (CLUTTER_ACTOR (priv->chooser_button),
-                                     for_height, min_width_p, natural_width_p);
+				     for_height, min_width_p, natural_width_p);
 
   mx_widget_get_padding (MX_WIDGET (actor), &padding);
   if (min_width_p)
@@ -400,7 +400,7 @@ e_mail_tab_picker_get_preferred_width (ClutterActor *actor,
       EMailTabPickerProps *props = t->data;
 
       clutter_actor_get_preferred_width (CLUTTER_ACTOR (props->tab), for_height,
-                                         &min_width, &natural_width);
+					 &min_width, &natural_width);
 
       if (min_width_p && !t->prev)
         *min_width_p += min_width;
@@ -422,7 +422,7 @@ e_mail_tab_picker_get_preferred_height (EMailTabPicker *tab_picker,
   EMailTabPickerPrivate *priv = tab_picker->priv;
 
   clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->chooser_button),
-                                     for_width, min_height_p, natural_height_p);
+				     for_width, min_height_p, natural_height_p);
 
   if (priv->tabs)
     {
@@ -434,25 +434,25 @@ e_mail_tab_picker_get_preferred_height (EMailTabPicker *tab_picker,
        * fixed height.
        */
       if (with_previews)
-        {
-          clutter_actor_get_preferred_height (CLUTTER_ACTOR (props->tab),
-                                              for_width,
-                                              &min_height,
-                                              &natural_height);
-          if (CLUTTER_ACTOR_IS_VISIBLE (priv->scroll_bar))
-            {
+	{
+	  clutter_actor_get_preferred_height (CLUTTER_ACTOR (props->tab),
+					      for_width,
+					      &min_height,
+					      &natural_height);
+	  if (CLUTTER_ACTOR_IS_VISIBLE (priv->scroll_bar))
+	    {
               /* Add the height of the scrollbar-section */
-              clutter_actor_get_preferred_height (
-                CLUTTER_ACTOR (priv->close_button), -1, NULL, &scroll_height);
-              scroll_height *= priv->preview_progress;
-
-              min_height += scroll_height;
-              natural_height += scroll_height;
-            }
-        }
+	      clutter_actor_get_preferred_height (
+		CLUTTER_ACTOR (priv->close_button), -1, NULL, &scroll_height);
+	      scroll_height *= priv->preview_progress;
+
+	      min_height += scroll_height;
+	      natural_height += scroll_height;
+	    }
+	}
       else
-        e_mail_tab_get_height_no_preview (props->tab, for_width,
-                                       &min_height, &natural_height);
+	e_mail_tab_get_height_no_preview (props->tab, for_width,
+				       &min_height, &natural_height);
 
       if (min_height_p && (*min_height_p < min_height))
         *min_height_p = min_height;
@@ -474,7 +474,7 @@ _e_mail_tab_picker_get_preferred_height (ClutterActor *actor,
                                       gfloat       *natural_height_p)
 {
   e_mail_tab_picker_get_preferred_height (E_MAIL_TAB_PICKER (actor), for_width,
-                                       min_height_p, natural_height_p, TRUE);
+				       min_height_p, natural_height_p, TRUE);
 }
 
 static void
@@ -493,13 +493,13 @@ e_mail_tab_picker_allocate_docked (EMailTabPicker           *tab_picker,
   if (!picker_box_p)
     {
       clutter_actor_get_allocation_box (CLUTTER_ACTOR (tab_picker),
-                                        &picker_box);
+					&picker_box);
       picker_box_p = &picker_box;
     }
   if (!chooser_box_p)
     {
       clutter_actor_get_allocation_box (CLUTTER_ACTOR (priv->chooser_button),
-                                        &chooser_box);
+					&chooser_box);
       chooser_box_p = &chooser_box;
     }
 
@@ -528,31 +528,31 @@ e_mail_tab_picker_allocate_docked (EMailTabPicker           *tab_picker,
       props->docked = FALSE;
 
       if (!props->docking)
-        continue;
+	continue;
 
       if (props->position < offset)
-        {
+	{
           /* Dock left */
-          priv->docked_tabs = TRUE;
-          props->docked = TRUE;
-          child_box.x1 = left;
-          child_box.x2 = child_box.x1 + props->width;
-          left += props->width;
-        }
+	  priv->docked_tabs = TRUE;
+	  props->docked = TRUE;
+	  child_box.x1 = left;
+	  child_box.x2 = child_box.x1 + props->width;
+	  left += props->width;
+	}
       else if (props->position + props->width > width + offset)
-        {
+	{
           /* Dock right */
-          priv->docked_tabs = TRUE;
-          props->docked = TRUE;
-          child_box.x2 = right;
-          child_box.x1 = child_box.x2 - props->width;
-          right -= props->width;
-        }
+	  priv->docked_tabs = TRUE;
+	  props->docked = TRUE;
+	  child_box.x2 = right;
+	  child_box.x1 = child_box.x2 - props->width;
+	  right -= props->width;
+	}
       else
-        {
-          child_box.x1 = props->position;
-          child_box.x2 = child_box.x1 + props->width;
-        }
+	{
+	  child_box.x1 = props->position;
+	  child_box.x2 = child_box.x1 + props->width;
+	}
 
       clutter_actor_allocate (CLUTTER_ACTOR (props->tab), &child_box, flags);
     }
@@ -567,7 +567,7 @@ e_mail_tab_picker_scroll_new_frame_cb (ClutterTimeline *timeline,
   gdouble alpha = clutter_alpha_get_alpha (priv->scroll_alpha);
 
   priv->scroll_offset = (priv->scroll_start * (1.0 - alpha)) +
-                        (priv->scroll_end * alpha);
+			(priv->scroll_end * alpha);
   mx_adjustment_set_value (priv->scroll_adjustment, priv->scroll_offset);
   e_mail_tab_picker_allocate_docked (tab_picker, NULL, NULL, 0);
   clutter_actor_queue_redraw (CLUTTER_ACTOR (tab_picker));
@@ -609,17 +609,17 @@ e_mail_tab_picker_scroll_to (EMailTabPicker *tab_picker,
   else
     {
       if (priv->scroll_end == priv->scroll_offset)
-        return;
+	return;
 
       priv->scroll_timeline = clutter_timeline_new (duration);
       priv->scroll_alpha = clutter_alpha_new_full (priv->scroll_timeline,
-                                                   CLUTTER_EASE_OUT_QUAD);
+						   CLUTTER_EASE_OUT_QUAD);
       g_signal_connect (priv->scroll_timeline, "new_frame",
-                        G_CALLBACK (e_mail_tab_picker_scroll_new_frame_cb),
-                        tab_picker);
+			G_CALLBACK (e_mail_tab_picker_scroll_new_frame_cb),
+			tab_picker);
       g_signal_connect (priv->scroll_timeline, "completed",
-                        G_CALLBACK (e_mail_tab_picker_scroll_completed_cb),
-                        tab_picker);
+			G_CALLBACK (e_mail_tab_picker_scroll_completed_cb),
+			tab_picker);
     }
 
   clutter_timeline_start (priv->scroll_timeline);
@@ -643,14 +643,14 @@ e_mail_tab_picker_allocate (ClutterActor           *actor,
 
   /* Allocate for scroll-bar and close button */
   clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button),
-                                    NULL, NULL, &width, &height);
+				    NULL, NULL, &width, &height);
   child_box.x1 = 0;
   child_box.x2 = box->x2 - box->x1 - padding.right;
   child_box.y1 = 0;
   child_box.y2 = child_box.y1 + height;
   clutter_actor_allocate (CLUTTER_ACTOR (priv->close_button),
-                          &child_box,
-                          flags);
+			  &child_box,
+			  flags);
 
   /* FIXME: Make this a property */
 #define SPACING 4.0
@@ -685,9 +685,9 @@ e_mail_tab_picker_allocate (ClutterActor           *actor,
 
       /* Don't stretch tabs without a preview to fit tabs with a preview */
       if (e_mail_tab_get_preview_actor (props->tab))
-        child_box.y2 = box->y2 - box->y1 - padding.bottom;
+	child_box.y2 = box->y2 - box->y1 - padding.bottom;
       else
-        child_box.y2 = child_box.y1 + height;
+	child_box.y2 = child_box.y1 + height;
 
       child_box.x2 = child_box.x1 + width;
       clutter_actor_allocate (actor, &child_box, flags);
@@ -697,14 +697,14 @@ e_mail_tab_picker_allocate (ClutterActor           *actor,
 
   /* Allocate for the chooser button */
   clutter_actor_get_preferred_width (CLUTTER_ACTOR (priv->chooser_button),
-                                     box->y2 - box->y1, NULL, &width);
+				     box->y2 - box->y1, NULL, &width);
 
   child_box.x2 = box->x2 - box->x1 - padding.right;
   child_box.x1 = child_box.x2 - width;
   child_box.y1 = 0;
   child_box.y2 = child_box.y1 + height;
   clutter_actor_allocate (CLUTTER_ACTOR (priv->chooser_button),
-                          &child_box, flags);
+			  &child_box, flags);
 
   /* Cache some useful size values */
   priv->width = (gint)(box->x2 - box->x1);
@@ -713,7 +713,7 @@ e_mail_tab_picker_allocate (ClutterActor           *actor,
 
   old_max_offset = priv->max_offset;
   priv->max_offset = priv->total_width - priv->width +
-                     (gint)(child_box.x2 - child_box.x1);
+		     (gint)(child_box.x2 - child_box.x1);
   if (priv->max_offset < 0)
     priv->max_offset = 0;
 
@@ -731,12 +731,12 @@ e_mail_tab_picker_allocate (ClutterActor           *actor,
                 "page-increment", (gdouble)(box->x2 - box->x1),
                 "page-size", (gdouble)(box->x2 - box->x1),
                 "upper", (gdouble)total_width,
-                NULL);
+		NULL);
 
   if ((priv->max_offset != old_max_offset) ||
       (priv->scroll_offset != old_scroll_offset))
     mx_adjustment_set_value (priv->scroll_adjustment,
-                             (gdouble)priv->scroll_offset);
+			     (gdouble)priv->scroll_offset);
 
   /* Allocate for scroll-bar */
   clutter_actor_allocate (CLUTTER_ACTOR (priv->scroll_bar), &scroll_box, flags);
@@ -745,11 +745,11 @@ e_mail_tab_picker_allocate (ClutterActor           *actor,
   if (priv->keep_current_visible)
     {
       EMailTabPickerProps *current =
-        g_list_nth_data (priv->tabs, priv->current_tab);
+	g_list_nth_data (priv->tabs, priv->current_tab);
 
       if ((current->position < priv->scroll_offset) ||
-          (current->position + current->width >= priv->max_offset))
-        e_mail_tab_picker_scroll_to (tab_picker, current->position, 150);
+	  (current->position + current->width >= priv->max_offset))
+	e_mail_tab_picker_scroll_to (tab_picker, current->position, 150);
     }
 }
 
@@ -813,38 +813,38 @@ e_mail_tab_picker_class_init (EMailTabPickerClass *klass)
   actor_class->unmap = e_mail_tab_picker_unmap;
 
   g_object_class_install_property (object_class,
-                                   PROP_PREVIEW_MODE,
+				   PROP_PREVIEW_MODE,
                                    g_param_spec_boolean ("preview-mode",
                                                          "Preview mode",
                                                          "Whether to display "
                                                          "in preview mode.",
-                                                         FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+							 FALSE,
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME |
+							 G_PARAM_STATIC_NICK |
+							 G_PARAM_STATIC_BLURB));
 
   g_object_class_override_property (object_class,
-                                    PROP_DROP_ENABLED,
+				    PROP_DROP_ENABLED,
                                     "drop-enabled");
 
   signals[TAB_ACTIVATED] =
     g_signal_new ("tab-activated",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (EMailTabPickerClass, tab_activated),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
-                  G_TYPE_NONE, 1, E_MAIL_TYPE_TAB);
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EMailTabPickerClass, tab_activated),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1, E_MAIL_TYPE_TAB);
 
   signals[CHOOSER_CLICKED] =
     g_signal_new ("chooser-clicked",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (EMailTabPickerClass, chooser_clicked),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EMailTabPickerClass, chooser_clicked),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
 }
 
 static void
@@ -907,28 +907,28 @@ e_mail_tab_picker_init (EMailTabPicker *self)
   clutter_actor_set_name (CLUTTER_ACTOR (priv->chooser_button),
                           "chooser-button");
   clutter_actor_set_parent (CLUTTER_ACTOR (priv->chooser_button),
-                            CLUTTER_ACTOR (self));
+			    CLUTTER_ACTOR (self));
 
   priv->close_button = mx_button_new ();
   clutter_actor_set_name (CLUTTER_ACTOR (priv->close_button),
                           "chooser-close-button");
   clutter_actor_set_parent (CLUTTER_ACTOR (priv->close_button),
-                            CLUTTER_ACTOR (self));
+			    CLUTTER_ACTOR (self));
   clutter_actor_hide (CLUTTER_ACTOR (priv->close_button));
 
   priv->scroll_adjustment = mx_adjustment_new_with_values (0, 0, 0, 100, 200, 200);
   priv->scroll_bar = mx_scroll_bar_new_with_adjustment (priv->scroll_adjustment);
   g_object_unref (priv->scroll_adjustment);
   clutter_actor_set_parent (CLUTTER_ACTOR (priv->scroll_bar),
-                            CLUTTER_ACTOR (self));
+			    CLUTTER_ACTOR (self));
   clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar));
 
   g_signal_connect (priv->chooser_button, "clicked",
-                    G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self);
+		    G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self);
   g_signal_connect (priv->close_button, "clicked",
-                    G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self);
+		    G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self);
   g_signal_connect (self, "scroll-event",
-                    G_CALLBACK (e_mail_tab_picker_scroll_event_cb), NULL);
+		    G_CALLBACK (e_mail_tab_picker_scroll_event_cb), NULL);
 }
 
 static gint
@@ -950,7 +950,7 @@ e_mail_tab_picker_tab_clicked_cb (EMailTab *tab, EMailTabPicker *self)
   EMailTab *old_tab =
     ((EMailTabPickerProps *)g_list_nth_data (priv->tabs, priv->current_tab))->tab;
   GList *new_tab_link = g_list_find_custom (priv->tabs, tab,
-                                            e_mail_tab_picker_find_tab_cb);
+					    e_mail_tab_picker_find_tab_cb);
 
   if (!new_tab_link)
     return;
@@ -962,7 +962,7 @@ e_mail_tab_picker_tab_clicked_cb (EMailTab *tab, EMailTabPicker *self)
     {
       e_mail_tab_set_active (tab, TRUE);
       if (priv->preview_mode)
-        g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab);
+	g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab);
       return;
     }
 
@@ -1032,11 +1032,11 @@ e_mail_tab_picker_add_tab (EMailTabPicker *picker, EMailTab *tab, gint position)
   mx_draggable_set_axis (MX_DRAGGABLE (tab), MX_DRAG_AXIS_X);
 
   g_signal_connect_after (tab, "clicked",
-                          G_CALLBACK (e_mail_tab_picker_tab_clicked_cb), picker);
+			  G_CALLBACK (e_mail_tab_picker_tab_clicked_cb), picker);
   g_signal_connect (tab, "drag-begin",
-                    G_CALLBACK (e_mail_tab_picker_tab_drag_begin_cb), picker);
+		    G_CALLBACK (e_mail_tab_picker_tab_drag_begin_cb), picker);
   g_signal_connect (tab, "drag-end",
-                    G_CALLBACK (e_mail_tab_picker_tab_drag_end_cb), picker);
+		    G_CALLBACK (e_mail_tab_picker_tab_drag_end_cb), picker);
 
   e_mail_tab_set_preview_mode (tab, priv->preview_mode);
   clutter_actor_queue_relayout (CLUTTER_ACTOR (picker));
@@ -1054,14 +1054,14 @@ e_mail_tab_picker_remove_tab (EMailTabPicker *picker, EMailTab *tab)
     return;
 
   g_signal_handlers_disconnect_by_func (tab,
-                                        e_mail_tab_picker_tab_clicked_cb,
-                                        picker);
+					e_mail_tab_picker_tab_clicked_cb,
+					picker);
   g_signal_handlers_disconnect_by_func (tab,
-                                        e_mail_tab_picker_tab_drag_begin_cb,
-                                        picker);
+					e_mail_tab_picker_tab_drag_begin_cb,
+					picker);
   g_signal_handlers_disconnect_by_func (tab,
-                                        e_mail_tab_picker_tab_drag_end_cb,
-                                        picker);
+					e_mail_tab_picker_tab_drag_end_cb,
+					picker);
 
   /* We don't want to do this during dispose, checking if chooser_button
    * exists is a way of checking if we're in dispose without keeping an
@@ -1071,17 +1071,17 @@ e_mail_tab_picker_remove_tab (EMailTabPicker *picker, EMailTab *tab)
     {
       gint position = g_list_position (priv->tabs, tab_link);
       if (priv->current_tab)
-        {
-          if (priv->current_tab > position)
-            priv->current_tab--;
-          else if (priv->current_tab == position)
-            e_mail_tab_picker_set_current_tab (picker, priv->current_tab - 1);
-        }
+	{
+	  if (priv->current_tab > position)
+	    priv->current_tab--;
+	  else if (priv->current_tab == position)
+	    e_mail_tab_picker_set_current_tab (picker, priv->current_tab - 1);
+	}
       else if (priv->tabs->next && (position == 0))
-        {
-          e_mail_tab_picker_set_current_tab (picker, priv->current_tab + 1);
-          priv->current_tab--;
-        }
+	{
+	  e_mail_tab_picker_set_current_tab (picker, priv->current_tab + 1);
+	  priv->current_tab--;
+	}
     }
 
   g_slice_free (EMailTabPickerProps, tab_link->data);
@@ -1120,7 +1120,7 @@ gint
 e_mail_tab_picker_get_tab_no (EMailTabPicker *picker, EMailTab *tab)
 {
   GList *tab_link = g_list_find_custom (picker->priv->tabs, tab,
-                                        e_mail_tab_picker_find_tab_cb);
+					e_mail_tab_picker_find_tab_cb);
   return g_list_position (picker->priv->tabs, tab_link);
 }
 
@@ -1178,15 +1178,15 @@ e_mail_tab_picker_reorder (EMailTabPicker *picker,
   if (priv->current_tab == old_position)
     {
       if (new_position < 0)
-        priv->current_tab = priv->n_tabs - 1;
+	priv->current_tab = priv->n_tabs - 1;
       else
-        priv->current_tab = CLAMP (new_position, 0, priv->n_tabs - 1);
+	priv->current_tab = CLAMP (new_position, 0, priv->n_tabs - 1);
     }
   else if ((priv->current_tab > old_position) &&
-           (new_position >= priv->current_tab))
+	   (new_position >= priv->current_tab))
     priv->current_tab--;
   else if ((priv->current_tab < old_position) &&
-           (new_position <= priv->current_tab))
+	   (new_position <= priv->current_tab))
     priv->current_tab++;
 
   clutter_actor_queue_relayout (CLUTTER_ACTOR (picker));
@@ -1219,16 +1219,16 @@ preview_completed_cb (ClutterTimeline *timeline,
       priv->preview_timeline = NULL;
 
       if (priv->preview_mode)
-        {
-          priv->preview_progress = 1.0;
-          clutter_actor_hide (CLUTTER_ACTOR (priv->chooser_button));
-        }
+	{
+	  priv->preview_progress = 1.0;
+	  clutter_actor_hide (CLUTTER_ACTOR (priv->chooser_button));
+	}
       else
-        {
-          priv->preview_progress = 0.0;
-          clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar));
-          clutter_actor_hide (CLUTTER_ACTOR (priv->close_button));
-        }
+	{
+	  priv->preview_progress = 0.0;
+	  clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar));
+	  clutter_actor_hide (CLUTTER_ACTOR (priv->close_button));
+	}
       clutter_actor_queue_relayout (CLUTTER_ACTOR (picker));
     }
 }
@@ -1256,35 +1256,35 @@ e_mail_tab_picker_set_preview_mode (EMailTabPicker *picker, gboolean preview)
   if (!priv->preview_timeline)
     {
       if (preview)
-        clutter_actor_show (CLUTTER_ACTOR (priv->scroll_bar));
+	clutter_actor_show (CLUTTER_ACTOR (priv->scroll_bar));
 
       priv->preview_timeline = clutter_timeline_new (150);
       g_signal_connect (priv->preview_timeline, "new-frame",
-                        G_CALLBACK (preview_new_frame_cb), picker);
+			G_CALLBACK (preview_new_frame_cb), picker);
       g_signal_connect (priv->preview_timeline, "completed",
-                        G_CALLBACK (preview_completed_cb), picker);
+			G_CALLBACK (preview_completed_cb), picker);
       clutter_timeline_start (priv->preview_timeline);
     }
   clutter_timeline_set_direction (priv->preview_timeline,
-                                  preview ? CLUTTER_TIMELINE_FORWARD :
-                                            CLUTTER_TIMELINE_BACKWARD);
+				  preview ? CLUTTER_TIMELINE_FORWARD :
+					    CLUTTER_TIMELINE_BACKWARD);
 
   /* Connect/disconnect the scrollbar */
   if (preview)
     g_signal_connect (priv->scroll_adjustment, "notify::value",
-                      G_CALLBACK (e_mail_tab_picker_scroll_value_cb), picker);
+		      G_CALLBACK (e_mail_tab_picker_scroll_value_cb), picker);
   else
     g_signal_handlers_disconnect_by_func (priv->scroll_adjustment,
-                                          e_mail_tab_picker_scroll_value_cb,
-                                          picker);
+					  e_mail_tab_picker_scroll_value_cb,
+					  picker);
 
   if (preview)
     {
       /* Fade out the chooser button show close button */
       clutter_actor_animate (CLUTTER_ACTOR (priv->chooser_button),
-                             CLUTTER_EASE_IN_OUT_QUAD, 150,
+			     CLUTTER_EASE_IN_OUT_QUAD, 150,
                              "opacity", 0x00,
-                             NULL);
+			     NULL);
       clutter_actor_show (CLUTTER_ACTOR (priv->close_button));
     }
   else
@@ -1292,16 +1292,16 @@ e_mail_tab_picker_set_preview_mode (EMailTabPicker *picker, gboolean preview)
       /* Fade in the chooser button */
       clutter_actor_show (CLUTTER_ACTOR (priv->chooser_button));
       clutter_actor_animate (CLUTTER_ACTOR (priv->chooser_button),
-                             CLUTTER_EASE_IN_OUT_QUAD, 150,
+			     CLUTTER_EASE_IN_OUT_QUAD, 150,
                              "opacity", 0xff,
-                             NULL);
+			     NULL);
     }
   clutter_actor_set_reactive (CLUTTER_ACTOR (priv->chooser_button), !preview);
 
   /* Remove the hover state, which likely got stuck when we clicked it */
   if (!preview)
     mx_stylable_set_style_pseudo_class (MX_STYLABLE (priv->chooser_button),
-                                        NULL);
+					NULL);
 
   g_object_notify (G_OBJECT (picker), "preview-mode");
 }
diff --git a/mail/e-mail-tab.c b/mail/e-mail-tab.c
index d5909ce1cb..cbbe8a83f6 100644
--- a/mail/e-mail-tab.c
+++ b/mail/e-mail-tab.c
@@ -148,7 +148,7 @@ e_mail_tab_drag_begin (MxDraggable         *draggable,
       clutter_actor_set_opacity (actor, 0x00);
       clutter_actor_animate (actor, CLUTTER_LINEAR, 150,
                              "opacity", 0xff,
-                             NULL);
+			     NULL);
     }
   clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);
 }
@@ -188,24 +188,24 @@ e_mail_tab_drag_end (MxDraggable *draggable,
     {
       ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor);
       if (parent)
-        {
+	{
           /* Animate drop */
-          if (CLUTTER_IS_TEXTURE (priv->drag_actor))
-            {
+	  if (CLUTTER_IS_TEXTURE (priv->drag_actor))
+	    {
               /* TODO: Some neat deformation effect? */
-              clutter_container_remove_actor (CLUTTER_CONTAINER (parent),
-                                              priv->drag_actor);
-            }
-          else
-            {
-              clutter_actor_animate (priv->drag_actor, CLUTTER_LINEAR, 150,
+	      clutter_container_remove_actor (CLUTTER_CONTAINER (parent),
+					      priv->drag_actor);
+	    }
+	  else
+	    {
+	      clutter_actor_animate (priv->drag_actor, CLUTTER_LINEAR, 150,
                                      "opacity", 0x00,
                                      "signal::completed",
-                                       G_CALLBACK (e_mail_tab_drag_end_anim_cb),
-                                       self,
-                                     NULL);
-            }
-        }
+				       G_CALLBACK (e_mail_tab_drag_end_anim_cb),
+				       self,
+				     NULL);
+	    }
+	}
       g_object_unref (priv->drag_actor);
       priv->drag_actor = NULL;
     }
@@ -294,21 +294,21 @@ e_mail_tab_get_property (GObject *object, guint property_id,
 
     case PROP_DRAG_ACTOR:
       if (!priv->drag_actor)
-        {
-          ClutterActor *fbo =
+	{
+	  ClutterActor *fbo =
             /*clutter_texture_new_from_actor (CLUTTER_ACTOR (tab));*/
-            NULL;
-          if (fbo)
-            {
+	    NULL;
+	  if (fbo)
+	    {
               /* This is where we'd setup deformations, or something along
                * those lines.
                */
-              priv->drag_actor = g_object_ref_sink (fbo);
-            }
-          else
-            priv->drag_actor =
-              g_object_ref_sink (clutter_clone_new (CLUTTER_ACTOR (tab)));
-        }
+	      priv->drag_actor = g_object_ref_sink (fbo);
+	    }
+	  else
+	    priv->drag_actor =
+	      g_object_ref_sink (clutter_clone_new (CLUTTER_ACTOR (tab)));
+	}
       g_value_set_object (value, priv->drag_actor);
       break;
 
@@ -347,7 +347,7 @@ e_mail_tab_set_property (GObject *object, guint property_id,
 
     case PROP_PREVIEW:
       e_mail_tab_set_preview_actor (tab,
-                                 CLUTTER_ACTOR (g_value_get_object (value)));
+				 CLUTTER_ACTOR (g_value_get_object (value)));
       break;
 
     case PROP_PREVIEW_MODE:
@@ -383,14 +383,14 @@ e_mail_tab_set_property (GObject *object, guint property_id,
 
     case PROP_DRAG_CONTAINMENT_AREA:
       {
-        ClutterActorBox *box = g_value_get_boxed (value);
+	ClutterActorBox *box = g_value_get_boxed (value);
 
-        if (box)
-          priv->drag_area = *box;
-        else
-          memset (&priv->drag_area, 0, sizeof (ClutterActorBox));
+	if (box)
+	  priv->drag_area = *box;
+	else
+	  memset (&priv->drag_area, 0, sizeof (ClutterActorBox));
 
-        break;
+	break;
       }
 
     case PROP_DRAG_ENABLED:
@@ -399,25 +399,25 @@ e_mail_tab_set_property (GObject *object, guint property_id,
 
     case PROP_DRAG_ACTOR:
       {
-        ClutterActor *new_actor = g_value_get_object (value);
+	ClutterActor *new_actor = g_value_get_object (value);
 
-        if (priv->drag_actor)
-          {
-            ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor);
+	if (priv->drag_actor)
+	  {
+	    ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor);
 
             /* We know it's a container because we added it ourselves */
-            if (parent)
-              clutter_container_remove_actor (CLUTTER_CONTAINER (parent),
-                                              priv->drag_actor);
+	    if (parent)
+	      clutter_container_remove_actor (CLUTTER_CONTAINER (parent),
+					      priv->drag_actor);
 
-            g_object_unref (priv->drag_actor);
-            priv->drag_actor = NULL;
-          }
+	    g_object_unref (priv->drag_actor);
+	    priv->drag_actor = NULL;
+	  }
 
-        if (new_actor)
-          priv->drag_actor = g_object_ref_sink (new_actor);
+	if (new_actor)
+	  priv->drag_actor = g_object_ref_sink (new_actor);
 
-        break;
+	break;
       }
 
     default:
@@ -433,7 +433,7 @@ e_mail_tab_dispose_old_bg (EMailTab *tab)
   if (priv->old_bg)
     {
       if (clutter_actor_get_parent (priv->old_bg) == (ClutterActor *)tab)
-        clutter_actor_unparent (priv->old_bg);
+	clutter_actor_unparent (priv->old_bg);
       g_object_unref (priv->old_bg);
       priv->old_bg = NULL;
     }
@@ -487,8 +487,8 @@ e_mail_tab_dispose (GObject *object)
     {
       ClutterActor *parent = clutter_actor_get_parent (priv->drag_actor);
       if (parent)
-        clutter_container_remove_actor (CLUTTER_CONTAINER (parent),
-                                        priv->drag_actor);
+	clutter_container_remove_actor (CLUTTER_CONTAINER (parent),
+					priv->drag_actor);
       g_object_unref (priv->drag_actor);
       priv->drag_actor = NULL;
     }
@@ -496,7 +496,7 @@ e_mail_tab_dispose (GObject *object)
   if (priv->drag_threshold_handler)
     {
       g_signal_handler_disconnect (gtk_settings_get_default (),
-                                   priv->drag_threshold_handler);
+				   priv->drag_threshold_handler);
       priv->drag_threshold_handler = 0;
     }
 
@@ -537,38 +537,38 @@ e_mail_tab_get_preferred_width (ClutterActor *actor,
       acc_min_width = acc_nat_width = 0;
 
       if (priv->has_text)
-        clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->label),
-                                          &acc_min_width, NULL,
-                                          &acc_nat_width, NULL);
+	clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->label),
+					  &acc_min_width, NULL,
+					  &acc_nat_width, NULL);
 
       if (priv->icon)
-        {
-          clutter_actor_get_preferred_size (priv->icon,
-                                            &min_width, NULL,
-                                            &nat_width, NULL);
-          acc_min_width += min_width;
-          acc_nat_width += nat_width;
-        }
+	{
+	  clutter_actor_get_preferred_size (priv->icon,
+					    &min_width, NULL,
+					    &nat_width, NULL);
+	  acc_min_width += min_width;
+	  acc_nat_width += nat_width;
+	}
 
       if (priv->can_close)
-        {
-          clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button),
-                                            &min_width, NULL,
-                                            &nat_width, NULL);
-          acc_min_width += min_width;
-          acc_nat_width += nat_width;
-        }
+	{
+	  clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button),
+					    &min_width, NULL,
+					    &nat_width, NULL);
+	  acc_min_width += min_width;
+	  acc_nat_width += nat_width;
+	}
 
       if (priv->preview && priv->preview_mode)
-        {
-          clutter_actor_get_preferred_size (priv->preview,
-                                            &min_width, NULL,
-                                            &nat_width, NULL);
-          if (min_width > acc_min_width)
-            acc_min_width = min_width;
-          if (nat_width > acc_nat_width)
-            acc_nat_width = nat_width;
-        }
+	{
+	  clutter_actor_get_preferred_size (priv->preview,
+					    &min_width, NULL,
+					    &nat_width, NULL);
+	  if (min_width > acc_min_width)
+	    acc_min_width = min_width;
+	  if (nat_width > acc_nat_width)
+	    acc_nat_width = nat_width;
+	}
 
       if (min_width_p)
         *min_width_p += acc_min_width;
@@ -599,26 +599,26 @@ e_mail_tab_get_height_no_preview (EMailTab *tab,
   min_height = nat_height = 0;
   if (priv->has_text)
     clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->label), -1,
-                                        &min_height, &nat_height);
+					&min_height, &nat_height);
 
   if (priv->icon)
     {
       clutter_actor_get_preferred_height (priv->icon, -1,
-                                          &tmp_min_height, &tmp_nat_height);
+					  &tmp_min_height, &tmp_nat_height);
       if (tmp_min_height > min_height)
-        min_height = tmp_min_height;
+	min_height = tmp_min_height;
       if (tmp_nat_height > nat_height)
-        nat_height = tmp_nat_height;
+	nat_height = tmp_nat_height;
     }
 
   if (priv->can_close)
     {
       clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->close_button),
-                                          -1, &tmp_min_height, &tmp_nat_height);
+					  -1, &tmp_min_height, &tmp_nat_height);
       if (tmp_min_height > min_height)
-        min_height = tmp_min_height;
+	min_height = tmp_min_height;
       if (tmp_nat_height > nat_height)
-        nat_height = tmp_nat_height;
+	nat_height = tmp_nat_height;
     }
 
   if (min_height_p)
@@ -637,7 +637,7 @@ e_mail_tab_get_preferred_height (ClutterActor *actor,
   EMailTabPrivate *priv = tab->priv;
 
   e_mail_tab_get_height_no_preview (tab, for_width,
-                                 min_height_p, natural_height_p);
+				 min_height_p, natural_height_p);
 
   if (priv->preview)
     {
@@ -648,20 +648,20 @@ e_mail_tab_get_preferred_height (ClutterActor *actor,
       mx_widget_get_padding (MX_WIDGET (actor), &padding);
 
       clutter_actor_get_preferred_height (priv->preview,
-                                          (gfloat)priv->width,
-                                          &min_height,
-                                          &nat_height);
+					  (gfloat)priv->width,
+					  &min_height,
+					  &nat_height);
 
       /* Add label height */
       clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->label), -1,
-                                          &label_min_height, &label_nat_height);
+					  &label_min_height, &label_nat_height);
 
       min_height = (min_height * priv->preview_height_progress) +
-                   padding.top + padding.bottom + priv->spacing +
-                   label_min_height;
+		   padding.top + padding.bottom + priv->spacing +
+		   label_min_height;
       nat_height = (nat_height * priv->preview_height_progress) +
-                   padding.top + padding.bottom + priv->spacing +
-                   label_nat_height;
+		   padding.top + padding.bottom + priv->spacing +
+		   label_nat_height;
 
       /* Sometimes the preview's natural height will be nan due to
        * keeping of the aspect ratio. This guards against that and stops
@@ -669,7 +669,7 @@ e_mail_tab_get_preferred_height (ClutterActor *actor,
        * minimum height.
        */
       if (isnan (nat_height))
-        nat_height = min_height;
+	nat_height = min_height;
 
       if (min_height_p && (min_height > *min_height_p))
         *min_height_p = min_height;
@@ -686,7 +686,7 @@ e_mail_tab_allocate (ClutterActor           *actor,
   MxPadding padding;
   ClutterActorBox child_box;
   gfloat icon_width, icon_height, label_width, label_height,
-         close_width, close_height, preview_width, preview_height;
+	 close_width, close_height, preview_width, preview_height;
 
   EMailTabPrivate *priv = E_MAIL_TAB (actor)->priv;
 
@@ -697,26 +697,26 @@ e_mail_tab_allocate (ClutterActor           *actor,
   if (priv->in_drag)
     {
       ClutterActor *drag_actor =
-        mx_draggable_get_drag_actor (MX_DRAGGABLE (actor));
+	mx_draggable_get_drag_actor (MX_DRAGGABLE (actor));
 
       if (drag_actor)
-        {
-          gfloat x, y;
-          clutter_actor_get_transformed_position (actor, &x, &y);
-          switch (mx_draggable_get_axis (MX_DRAGGABLE (actor)))
-            {
-            case MX_DRAG_AXIS_X :
+	{
+	  gfloat x, y;
+	  clutter_actor_get_transformed_position (actor, &x, &y);
+	  switch (mx_draggable_get_axis (MX_DRAGGABLE (actor)))
+	    {
+	    case MX_DRAG_AXIS_X :
               /* Synchronise y axis */
-              clutter_actor_set_y (drag_actor, y);
-              break;
-            case MX_DRAG_AXIS_Y :
+	      clutter_actor_set_y (drag_actor, y);
+	      break;
+	    case MX_DRAG_AXIS_Y :
               /* Synchronise x axis */
-              clutter_actor_set_x (drag_actor, x);
-              break;
-            default :
-              break;
-            }
-        }
+	      clutter_actor_set_x (drag_actor, x);
+	      break;
+	    default :
+	      break;
+	    }
+	}
     }
 
   /* Allocate old background texture */
@@ -734,12 +734,12 @@ e_mail_tab_allocate (ClutterActor           *actor,
   /* Get the preferred width/height of the icon, label and close-button first */
   if (priv->icon)
     clutter_actor_get_preferred_size (priv->icon, NULL, NULL,
-                                      &icon_width, &icon_height);
+				      &icon_width, &icon_height);
   clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->label), NULL, NULL,
-                                    &label_width, &label_height);
+				    &label_width, &label_height);
   if (priv->can_close)
     clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button),
-                                      NULL, NULL, &close_width, &close_height);
+				      NULL, NULL, &close_width, &close_height);
 
   /* Allocate for icon */
   if (priv->icon)
@@ -759,8 +759,8 @@ e_mail_tab_allocate (ClutterActor           *actor,
       child_box.y1 = E_MAIL_PIXBOUND ((box->y2 - box->y1)/2 - close_height/2);
       child_box.y2 = child_box.y1 + close_height;
       clutter_actor_allocate (CLUTTER_ACTOR (priv->close_button),
-                              &child_box,
-                              flags);
+			      &child_box,
+			      flags);
     }
 
   /* Allocate for preview widget */
@@ -769,7 +769,7 @@ e_mail_tab_allocate (ClutterActor           *actor,
     {
       preview_width = (box->x2 - box->x1 - padding.left - padding.right);
       preview_height = (box->y2 - box->y1 - padding.top - padding.bottom -
-                        priv->spacing - label_height);
+			priv->spacing - label_height);
 
       child_box.x1 = E_MAIL_PIXBOUND (padding.left);
       child_box.y1 = E_MAIL_PIXBOUND (padding.top);
@@ -782,16 +782,16 @@ e_mail_tab_allocate (ClutterActor           *actor,
   if ((priv->preview_height_progress <= TAB_S1_ANIM) || (!priv->preview))
     {
       if (priv->icon)
-        child_box.x1 = E_MAIL_PIXBOUND (padding.left + icon_width + priv->spacing);
+	child_box.x1 = E_MAIL_PIXBOUND (padding.left + icon_width + priv->spacing);
       else
-        child_box.x1 = E_MAIL_PIXBOUND (padding.left);
+	child_box.x1 = E_MAIL_PIXBOUND (padding.left);
       child_box.x2 = (box->x2 - box->x1 - padding.right);
       child_box.y1 = E_MAIL_PIXBOUND ((box->y2 - box->y1)/2 - label_height/2);
       child_box.y2 = child_box.y1 + label_height;
 
       /* If close button is visible, don't overlap it */
       if (priv->can_close)
-        child_box.x2 -= close_width + priv->spacing;
+	child_box.x2 -= close_width + priv->spacing;
     }
   else
     {
@@ -799,7 +799,7 @@ e_mail_tab_allocate (ClutterActor           *actor,
       child_box.x1 = E_MAIL_PIXBOUND (padding.left);
       child_box.x2 = (box->x2 - box->x1 - padding.right);
       child_box.y1 = E_MAIL_PIXBOUND (padding.top + preview_height +
-                                   priv->spacing);
+				   priv->spacing);
       child_box.y2 = child_box.y1 + label_height;
     }
 
@@ -812,23 +812,23 @@ e_mail_tab_allocate (ClutterActor           *actor,
     {
       gfloat max_height = padding.top + padding.bottom + preview_height;
       if (box->y2 - box->y1 > max_height)
-        {
-          MxWidget *widget = MX_WIDGET (actor);
-          ClutterActor *background = mx_widget_get_border_image (widget);
-
-          if (!background)
-            background = mx_widget_get_background_image (widget);
-
-          child_box.x1 = 0;
-          child_box.x2 = box->x2 - box->x1;
-          child_box.y1 = 0;
-          child_box.y2 = max_height;
-
-          if (background)
-            clutter_actor_allocate (background, &child_box, flags);
-          if (priv->old_bg && (priv->old_bg != background))
-            clutter_actor_allocate (priv->old_bg, &child_box, flags);
-        }
+	{
+	  MxWidget *widget = MX_WIDGET (actor);
+	  ClutterActor *background = mx_widget_get_border_image (widget);
+
+	  if (!background)
+	    background = mx_widget_get_background_image (widget);
+
+	  child_box.x1 = 0;
+	  child_box.x2 = box->x2 - box->x1;
+	  child_box.y1 = 0;
+	  child_box.y2 = max_height;
+
+	  if (background)
+	    clutter_actor_allocate (background, &child_box, flags);
+	  if (priv->old_bg && (priv->old_bg != background))
+	    clutter_actor_allocate (priv->old_bg, &child_box, flags);
+	}
     }
 }
 
@@ -934,12 +934,12 @@ e_mail_tab_button_release_event (ClutterActor       *actor,
        * in being set active.
        */
       if (priv->hover)
-        {
-          if (!priv->active)
-            e_mail_tab_set_active (tab, TRUE);
+	{
+	  if (!priv->active)
+	    e_mail_tab_set_active (tab, TRUE);
 
-          g_signal_emit (actor, signals[CLICKED], 0);
-        }
+	  g_signal_emit (actor, signals[CLICKED], 0);
+	}
     }
 
   return FALSE;
@@ -955,20 +955,20 @@ e_mail_tab_motion_event (ClutterActor       *actor,
   if (priv->pressed && priv->drag_enabled)
     {
       if ((ABS (event->x - priv->press_x) >= priv->drag_threshold) ||
-          (ABS (event->y - priv->press_y) >= priv->drag_threshold))
-        {
+	  (ABS (event->y - priv->press_y) >= priv->drag_threshold))
+	{
           /* Ungrab the pointer so that the MxDraggable code can take over */
-          clutter_ungrab_pointer ();
-          priv->pressed = FALSE;
-          if (!priv->active)
-            {
-              if (priv->hover)
-                mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor),
+	  clutter_ungrab_pointer ();
+	  priv->pressed = FALSE;
+	  if (!priv->active)
+	    {
+	      if (priv->hover)
+		mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor),
                                                     "hover");
-              else
-                mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor), NULL);
-            }
-        }
+	      else
+		mx_stylable_set_style_pseudo_class (MX_STYLABLE (actor), NULL);
+	    }
+	}
     }
 
   return FALSE;
@@ -1038,182 +1038,182 @@ e_mail_tab_class_init (EMailTabClass *klass)
   actor_class->unmap = e_mail_tab_unmap;
 
   g_object_class_install_property (object_class,
-                                   PROP_ICON,
+				   PROP_ICON,
                                    g_param_spec_object ("icon",
                                                         "Icon",
                                                         "Icon actor.",
-                                                        CLUTTER_TYPE_ACTOR,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_NAME |
-                                                        G_PARAM_STATIC_NICK |
-                                                        G_PARAM_STATIC_BLURB));
+							CLUTTER_TYPE_ACTOR,
+							G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME |
+							G_PARAM_STATIC_NICK |
+							G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_TEXT,
+				   PROP_TEXT,
                                    g_param_spec_string ("text",
                                                         "Text",
                                                         "Tab text.",
                                                         "",
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_NAME |
-                                                        G_PARAM_STATIC_NICK |
-                                                        G_PARAM_STATIC_BLURB));
+							G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME |
+							G_PARAM_STATIC_NICK |
+							G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_CAN_CLOSE,
+				   PROP_CAN_CLOSE,
                                    g_param_spec_boolean ("can-close",
                                                          "Can close",
                                                          "Whether the tab can "
                                                          "close.",
-                                                         TRUE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+							 TRUE,
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME |
+							 G_PARAM_STATIC_NICK |
+							 G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_TAB_WIDTH,
+				   PROP_TAB_WIDTH,
                                    g_param_spec_int ("tab-width",
                                                      "Tab width",
                                                      "Tab width.",
-                                                     -1, G_MAXINT, -1,
-                                                     G_PARAM_READWRITE |
-                                                     G_PARAM_STATIC_NAME |
-                                                     G_PARAM_STATIC_NICK |
-                                                     G_PARAM_STATIC_BLURB));
+						     -1, G_MAXINT, -1,
+						     G_PARAM_READWRITE |
+						     G_PARAM_STATIC_NAME |
+						     G_PARAM_STATIC_NICK |
+						     G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_DOCKING,
+				   PROP_DOCKING,
                                    g_param_spec_boolean ("docking",
                                                          "Docking",
                                                          "Whether the tab "
                                                          "should dock to edges "
                                                          "when scrolled.",
-                                                         FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+							 FALSE,
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME |
+							 G_PARAM_STATIC_NICK |
+							 G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_PREVIEW,
+				   PROP_PREVIEW,
                                    g_param_spec_object ("preview",
                                                         "Preview actor",
                                                         "ClutterActor used "
                                                         "when in preview mode.",
-                                                        CLUTTER_TYPE_ACTOR,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_NAME |
-                                                        G_PARAM_STATIC_NICK |
-                                                        G_PARAM_STATIC_BLURB));
+							CLUTTER_TYPE_ACTOR,
+							G_PARAM_READWRITE |
+							G_PARAM_STATIC_NAME |
+							G_PARAM_STATIC_NICK |
+							G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_PREVIEW_MODE,
+				   PROP_PREVIEW_MODE,
                                    g_param_spec_boolean ("preview-mode",
                                                          "Preview mode",
                                                          "Whether to display "
                                                          "in preview mode.",
-                                                         FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+							 FALSE,
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME |
+							 G_PARAM_STATIC_NICK |
+							 G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_PREVIEW_DURATION,
+				   PROP_PREVIEW_DURATION,
                                    g_param_spec_uint ("preview-duration",
                                                       "Preview duration",
                                                       "How long the transition "
                                                       "between preview mode "
                                                       "states lasts, in ms.",
-                                                      0, G_MAXUINT, 200,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_NAME |
-                                                      G_PARAM_STATIC_NICK |
-                                                      G_PARAM_STATIC_BLURB));
+						      0, G_MAXUINT, 200,
+						      G_PARAM_READWRITE |
+						      G_PARAM_STATIC_NAME |
+						      G_PARAM_STATIC_NICK |
+						      G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_SPACING,
+				   PROP_SPACING,
                                    g_param_spec_float ("spacing",
                                                        "Spacing",
                                                        "Spacing between "
                                                        "tab elements.",
-                                                       0, G_MAXFLOAT,
-                                                       6.0,
-                                                       G_PARAM_READWRITE |
-                                                       G_PARAM_STATIC_NAME |
-                                                       G_PARAM_STATIC_NICK |
-                                                       G_PARAM_STATIC_BLURB));
+						       0, G_MAXFLOAT,
+						       6.0,
+						       G_PARAM_READWRITE |
+						       G_PARAM_STATIC_NAME |
+						       G_PARAM_STATIC_NICK |
+						       G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_PRIVATE,
+				   PROP_PRIVATE,
                                    g_param_spec_boolean ("private",
                                                          "Private",
                                                          "Set if the tab is "
                                                          "'private'.",
-                                                         FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+							 FALSE,
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME |
+							 G_PARAM_STATIC_NICK |
+							 G_PARAM_STATIC_BLURB));
 
   g_object_class_install_property (object_class,
-                                   PROP_ACTIVE,
+				   PROP_ACTIVE,
                                    g_param_spec_boolean ("active",
                                                          "Active",
                                                          "Set if the tab is "
                                                          "active.",
-                                                         FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_NICK |
-                                                         G_PARAM_STATIC_BLURB));
+							 FALSE,
+							 G_PARAM_READWRITE |
+							 G_PARAM_STATIC_NAME |
+							 G_PARAM_STATIC_NICK |
+							 G_PARAM_STATIC_BLURB));
 
   g_object_class_override_property (object_class,
-                                    PROP_DRAG_THRESHOLD,
+				    PROP_DRAG_THRESHOLD,
                                     "drag-threshold");
   g_object_class_override_property (object_class,
-                                    PROP_DRAG_AXIS,
+				    PROP_DRAG_AXIS,
                                     "axis");
  // g_object_class_override_property (object_class,
    //                                 PROP_DRAG_CONTAINMENT_TYPE,
      //                               "containment-type");
   g_object_class_override_property (object_class,
-                                    PROP_DRAG_CONTAINMENT_AREA,
+				    PROP_DRAG_CONTAINMENT_AREA,
                                     "containment-area");
   g_object_class_override_property (object_class,
-                                    PROP_DRAG_ENABLED,
+				    PROP_DRAG_ENABLED,
                                     "drag-enabled");
   g_object_class_override_property (object_class,
-                                    PROP_DRAG_ACTOR,
+				    PROP_DRAG_ACTOR,
                                     "drag-actor");
 
   signals[CLICKED] =
     g_signal_new ("clicked",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (EMailTabClass, clicked),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EMailTabClass, clicked),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
 
   signals[CLOSED] =
     g_signal_new ("closed",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (EMailTabClass, closed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EMailTabClass, closed),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
 
   signals[TRANSITION_COMPLETE] =
     g_signal_new ("transition-complete",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (EMailTabClass, transition_complete),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (EMailTabClass, transition_complete),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__VOID,
+		  G_TYPE_NONE, 0);
 }
 
 static void
@@ -1242,42 +1242,42 @@ e_mail_tab_style_changed_cb (MxWidget *widget)
   if (priv->old_bg)
     {
       if (!clutter_actor_get_parent (priv->old_bg))
-        {
-          ClutterActorBox box;
-          ClutterActor *background;
-          ClutterActor *actor = CLUTTER_ACTOR (widget);
+	{
+	  ClutterActorBox box;
+	  ClutterActor *background;
+	  ClutterActor *actor = CLUTTER_ACTOR (widget);
 
-          clutter_actor_set_parent (priv->old_bg, actor);
+	  clutter_actor_set_parent (priv->old_bg, actor);
 
           /* Try to allocate the same size as the background widget,
            * otherwise allocate the same size as the widget itself.
            */
-          background = mx_widget_get_border_image (widget);
-          if (!background)
-            background = mx_widget_get_background_image (widget);
-
-          if (background)
-            clutter_actor_get_allocation_box (background, &box);
-          else
-            {
-              clutter_actor_get_allocation_box (actor, &box);
-              box.x2 -= box.x1;
-              box.y2 -= box.y1;
-              box.x1 = 0;
-              box.y1 = 0;
-            }
-
-          clutter_actor_allocate (priv->old_bg, &box, 0);
-        }
+	  background = mx_widget_get_border_image (widget);
+	  if (!background)
+	    background = mx_widget_get_background_image (widget);
+
+	  if (background)
+	    clutter_actor_get_allocation_box (background, &box);
+	  else
+	    {
+	      clutter_actor_get_allocation_box (actor, &box);
+	      box.x2 -= box.x1;
+	      box.y2 -= box.y1;
+	      box.x1 = 0;
+	      box.y1 = 0;
+	    }
+
+	  clutter_actor_allocate (priv->old_bg, &box, 0);
+	}
 
       clutter_actor_animate (priv->old_bg,
-                             CLUTTER_LINEAR,
-                             150,
+			     CLUTTER_LINEAR,
+			     150,
                              "opacity", 0,
                              "signal::completed",
-                               G_CALLBACK (e_mail_tab_anim_completed_cb),
-                               widget,
-                             NULL);
+			       G_CALLBACK (e_mail_tab_anim_completed_cb),
+			       widget,
+			     NULL);
     }
 }
 
@@ -1301,7 +1301,7 @@ e_mail_tab_dnd_notify_cb (GObject    *settings,
 {
   g_object_get (settings,
                 "gtk-dnd-drag-threshold", &tab->priv->drag_threshold,
-                NULL);
+		NULL);
 }
 
 static void
@@ -1322,32 +1322,32 @@ e_mail_tab_init (EMailTab *self)
   text = mx_label_get_clutter_text (MX_LABEL (priv->label));
   clutter_text_set_ellipsize (CLUTTER_TEXT (text), PANGO_ELLIPSIZE_END);
   clutter_actor_set_parent (CLUTTER_ACTOR (priv->label),
-                            CLUTTER_ACTOR (self));
+			    CLUTTER_ACTOR (self));
 
   priv->close_button = mx_button_new ();
   clutter_actor_set_name (CLUTTER_ACTOR (priv->close_button),
                           "tab-close-button");
   clutter_actor_set_parent (CLUTTER_ACTOR (priv->close_button),
-                            CLUTTER_ACTOR (self));
+			    CLUTTER_ACTOR (self));
 
   g_signal_connect (priv->close_button, "clicked",
-                    G_CALLBACK (e_mail_tab_close_clicked_cb), self);
+		    G_CALLBACK (e_mail_tab_close_clicked_cb), self);
 
   /* Connect up styling signals */
   g_signal_connect (self, "style-changed",
-                    G_CALLBACK (e_mail_tab_style_changed_cb), NULL);
+		    G_CALLBACK (e_mail_tab_style_changed_cb), NULL);
   g_signal_connect (self, "stylable-changed",
-                    G_CALLBACK (e_mail_tab_stylable_changed_cb), NULL);
+		    G_CALLBACK (e_mail_tab_stylable_changed_cb), NULL);
 
   clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
 
   settings = gtk_settings_get_default ();
   priv->drag_threshold_handler =
     g_signal_connect (settings, "notify::gtk-dnd-drag-threshold",
-                      G_CALLBACK (e_mail_tab_dnd_notify_cb), self);
+		      G_CALLBACK (e_mail_tab_dnd_notify_cb), self);
   g_object_get (G_OBJECT (settings),
                 "gtk-dnd-drag-threshold", &priv->drag_threshold,
-                NULL);
+		NULL);
 }
 
 ClutterActor *
@@ -1526,7 +1526,7 @@ e_mail_tab_set_preview_actor (EMailTab *tab, ClutterActor *actor)
 
       clutter_actor_set_opacity (actor, priv->preview_mode ? 0xff : 0x00);
       if (!priv->preview_mode)
-        clutter_actor_hide (actor);
+	clutter_actor_hide (actor);
     }
 
   clutter_actor_queue_relayout (CLUTTER_ACTOR (tab));
@@ -1550,7 +1550,7 @@ preview_new_frame_cb (ClutterTimeline *timeline,
   EMailTabPrivate *priv = tab->priv;
 
   forwards = (clutter_timeline_get_direction (timeline) ==
-               CLUTTER_TIMELINE_FORWARD) ? TRUE : FALSE;
+	       CLUTTER_TIMELINE_FORWARD) ? TRUE : FALSE;
   if (priv->preview_mode)
     forwards = !forwards;
 
@@ -1575,32 +1575,32 @@ preview_completed_cb (ClutterTimeline *timeline,
       priv->preview_timeline = NULL;
 
       if (priv->preview_mode)
-        priv->preview_height_progress = 1.0;
+	priv->preview_height_progress = 1.0;
       else
-        {
-          priv->preview_height_progress = 0.0;
-          if (priv->preview)
-            clutter_actor_hide (priv->preview);
-          if (priv->can_close)
-            clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button),
-                                        TRUE);
-        }
+	{
+	  priv->preview_height_progress = 0.0;
+	  if (priv->preview)
+	    clutter_actor_hide (priv->preview);
+	  if (priv->can_close)
+	    clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button),
+					TRUE);
+	}
 
       /* Remove style hint if we're not in preview mode */
       if (priv->preview)
-        {
-          if (!priv->preview_mode)
-            clutter_actor_set_name (CLUTTER_ACTOR (tab),
+	{
+	  if (!priv->preview_mode)
+	    clutter_actor_set_name (CLUTTER_ACTOR (tab),
                                     priv->private ? "private-tab" : NULL);
-        }
+	}
       else
-        {
+	{
           /* If there's no preview actor, disable the tab */
-          clutter_actor_set_reactive (CLUTTER_ACTOR (tab), !priv->preview_mode);
-        }
+	  clutter_actor_set_reactive (CLUTTER_ACTOR (tab), !priv->preview_mode);
+	}
 
       if (priv->preview)
-        clutter_actor_queue_relayout (CLUTTER_ACTOR (tab));
+	clutter_actor_queue_relayout (CLUTTER_ACTOR (tab));
 
       g_signal_emit (tab, signals[TRANSITION_COMPLETE], 0);
     }
@@ -1614,10 +1614,10 @@ preview_s1_started_cb (ClutterTimeline *timeline,
 
   if (!priv->preview)
     clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->label),
-                                         CLUTTER_EASE_IN_OUT_QUAD,
-                                         timeline,
+					 CLUTTER_EASE_IN_OUT_QUAD,
+					 timeline,
                                          "opacity", 0xff,
-                                         NULL);
+					 NULL);
 }
 
 static void
@@ -1628,10 +1628,10 @@ preview_s2_started_cb (ClutterTimeline *timeline,
 
   if (priv->preview)
     clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->label),
-                                         CLUTTER_EASE_IN_OUT_QUAD,
-                                         timeline,
+					 CLUTTER_EASE_IN_OUT_QUAD,
+					 timeline,
                                          "opacity", 0xff,
-                                         NULL);
+					 NULL);
 }
 
 void
@@ -1648,87 +1648,87 @@ e_mail_tab_set_preview_mode (EMailTab *tab, gboolean preview)
 
       /* Disable the close button in preview mode */
       if (preview && priv->can_close)
-        clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button), FALSE);
+	clutter_actor_set_reactive (CLUTTER_ACTOR (priv->close_button), FALSE);
 
 #define DEBUG_MULT 1
       if (priv->preview_timeline)
-        {
-          progress = 1.0 -
-                     clutter_timeline_get_progress (priv->preview_timeline);
-          clutter_timeline_stop (priv->preview_timeline);
-          g_object_unref (priv->preview_timeline);
-        }
+	{
+	  progress = 1.0 -
+		     clutter_timeline_get_progress (priv->preview_timeline);
+	  clutter_timeline_stop (priv->preview_timeline);
+	  g_object_unref (priv->preview_timeline);
+	}
       else
-        progress = 0.0;
+	progress = 0.0;
 
       total_duration = priv->anim_length * (1.0 - progress) * DEBUG_MULT;
       duration1 = total_duration * TAB_S1_ANIM;
       duration2 = total_duration * TAB_S2_ANIM;
 
       priv->preview_timeline =
-        clutter_timeline_new (priv->anim_length * DEBUG_MULT);
+	clutter_timeline_new (priv->anim_length * DEBUG_MULT);
       clutter_timeline_skip (priv->preview_timeline,
-        clutter_timeline_get_duration (priv->preview_timeline) * progress);
+	clutter_timeline_get_duration (priv->preview_timeline) * progress);
 
       g_signal_connect (priv->preview_timeline, "completed",
-                        G_CALLBACK (preview_completed_cb), tab);
+			G_CALLBACK (preview_completed_cb), tab);
 
       clutter_timeline_start (priv->preview_timeline);
 
       if (!priv->preview)
-        {
-          clutter_actor_animate_with_timeline (CLUTTER_ACTOR (tab),
-                                               CLUTTER_EASE_IN_OUT_QUAD,
-                                               priv->preview_timeline,
+	{
+	  clutter_actor_animate_with_timeline (CLUTTER_ACTOR (tab),
+					       CLUTTER_EASE_IN_OUT_QUAD,
+					       priv->preview_timeline,
                                                "opacity", preview ? 0x00 : 0xff,
-                                               NULL);
-          return;
-        }
+					       NULL);
+	  return;
+	}
 
       g_signal_connect (priv->preview_timeline, "new-frame",
-                        G_CALLBACK (preview_new_frame_cb), tab);
+			G_CALLBACK (preview_new_frame_cb), tab);
 
       timeline = clutter_timeline_new ((guint)duration1);
       timeline2 = clutter_timeline_new ((guint)duration2);
 
       g_signal_connect (timeline, "started",
-                        G_CALLBACK (preview_s1_started_cb), tab);
+			G_CALLBACK (preview_s1_started_cb), tab);
       g_signal_connect (timeline2, "started",
-                        G_CALLBACK (preview_s2_started_cb), tab);
+			G_CALLBACK (preview_s2_started_cb), tab);
 
       if (preview)
-        clutter_timeline_set_delay (timeline2, duration1);
+	clutter_timeline_set_delay (timeline2, duration1);
       else
-        clutter_timeline_set_delay (timeline, duration2);
+	clutter_timeline_set_delay (timeline, duration2);
 
       /* clutter_actor_animate_with_timeline will start the timelines */
       clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->label),
-                                           CLUTTER_EASE_IN_OUT_QUAD,
-                                           preview ? timeline : timeline2,
+					   CLUTTER_EASE_IN_OUT_QUAD,
+					   preview ? timeline : timeline2,
                                            "opacity", 0x00,
-                                           NULL);
+					   NULL);
       if (priv->icon)
-        clutter_actor_animate_with_timeline (priv->icon,
-                                             CLUTTER_EASE_IN_OUT_QUAD,
-                                             timeline,
+	clutter_actor_animate_with_timeline (priv->icon,
+					     CLUTTER_EASE_IN_OUT_QUAD,
+					     timeline,
                                              "opacity", preview ? 0x00 : 0xff,
-                                             NULL);
+					     NULL);
       if (priv->can_close)
-        clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->close_button),
-                                             CLUTTER_EASE_IN_OUT_QUAD,
-                                             timeline,
+	clutter_actor_animate_with_timeline (CLUTTER_ACTOR (priv->close_button),
+					     CLUTTER_EASE_IN_OUT_QUAD,
+					     timeline,
                                              "opacity", preview ? 0x00 : 0xff,
-                                             NULL);
+					     NULL);
 
       if (priv->preview)
-        {
-          clutter_actor_show (priv->preview);
-          clutter_actor_animate_with_timeline (priv->preview,
-                                               CLUTTER_EASE_IN_OUT_QUAD,
-                                               timeline2,
+	{
+	  clutter_actor_show (priv->preview);
+	  clutter_actor_animate_with_timeline (priv->preview,
+					       CLUTTER_EASE_IN_OUT_QUAD,
+					       timeline2,
                                                "opacity", preview ? 0xff : 0x00,
-                                               NULL);
-        }
+					       NULL);
+	}
 
       /* The animations have references on these, drop ours */
       g_object_unref (timeline);
@@ -1830,7 +1830,7 @@ e_mail_tab_set_active (EMailTab *tab, gboolean active)
       if (priv->hover)
         mx_stylable_set_style_pseudo_class (MX_STYLABLE (tab), "hover");
       else
-        mx_stylable_set_style_pseudo_class (MX_STYLABLE (tab), NULL);
+	mx_stylable_set_style_pseudo_class (MX_STYLABLE (tab), NULL);
     }
 }
 
@@ -1878,10 +1878,10 @@ e_mail_tab_alert (EMailTab *tab)
   if (!priv->alert_source)
     priv->alert_source =
       g_timeout_add_full (G_PRIORITY_HIGH,
-                          500,
-                          (GSourceFunc)e_mail_tab_alert_cb,
-                          tab,
-                          NULL);
+			  500,
+			  (GSourceFunc)e_mail_tab_alert_cb,
+			  tab,
+			  NULL);
 }
 
 void
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index cf33586453..54c298a3e9 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -579,7 +579,7 @@ static gboolean
 is_email (const gchar *address)
 {
 	/* This is supposed to check if the address's domain could be
-           an FQDN but alas, it's not worth the pain and suffering. */
+	   an FQDN but alas, it's not worth the pain and suffering. */
 	const gchar *at;
 
 	at = strchr (address, '@');
@@ -1410,36 +1410,36 @@ emae_uri_changed (EMAccountEditorService *service, CamelURL *url)
 static void
 emae_service_url_changed (EMAccountEditorService *service, void (*setval)(CamelURL *, const gchar *), GtkEntry *entry)
 {
-        GtkComboBox *dropdown;
-        gint id;
-        GtkTreeModel *model;
-        GtkTreeIter iter;
-        CamelServiceAuthType *authtype;
+	GtkComboBox *dropdown;
+	gint id;
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	CamelServiceAuthType *authtype;
 
-        CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key);
-        gchar *text = g_strdup (gtk_entry_get_text (entry));
+	CamelURL *url = emae_account_url (service->emae, emae_service_info[service->type].account_uri_key);
+	gchar *text = g_strdup (gtk_entry_get_text (entry));
 
 	g_strstrip (text);
 
-        setval (url, (text && text[0])?text:NULL);
-
-        if (text && text[0] && setval == camel_url_set_user) {
-                dropdown = service->authtype;
-                if (dropdown) {
-                        id = gtk_combo_box_get_active (dropdown);
-                        if (id != -1) {
-                                model = gtk_combo_box_get_model (dropdown);
-                                        if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) {
-                                                gtk_tree_model_get (model, &iter, 1, &authtype, -1);
-                                                if (authtype)
-                                                        camel_url_set_authmech (url, authtype->authproto);
-                                        }
-                        }
-                }
-        }
-
-        emae_uri_changed (service, url);
-        camel_url_free (url);
+	setval (url, (text && text[0])?text:NULL);
+
+	if (text && text[0] && setval == camel_url_set_user) {
+		dropdown = service->authtype;
+		if (dropdown) {
+			id = gtk_combo_box_get_active (dropdown);
+			if (id != -1) {
+				model = gtk_combo_box_get_model (dropdown);
+					if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) {
+						gtk_tree_model_get (model, &iter, 1, &authtype, -1);
+						if (authtype)
+							camel_url_set_authmech (url, authtype->authproto);
+					}
+			}
+		}
+	}
+
+	emae_uri_changed (service, url);
+	camel_url_free (url);
 	g_free (text);
 }
 
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index 9ad4cacc39..4daf441ead 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -143,7 +143,7 @@ filter_folder_element_finalize (GObject *object)
 	g_free (priv->uri);
 
 	/* Chain up to parent's finalize() method. */
-        G_OBJECT_CLASS (em_filter_folder_element_parent_class)->finalize (object);
+	G_OBJECT_CLASS (em_filter_folder_element_parent_class)->finalize (object);
 }
 
 static void
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 714822bcde..545eb1fce4 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -116,7 +116,7 @@ em_filter_rule_finalise (GObject *obj)
 	unref_list (ff->actions);
 	g_list_free (ff->actions);
 
-        G_OBJECT_CLASS (parent_class)->finalize (obj);
+	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
 /**
@@ -209,7 +209,7 @@ list_eq (GList *al, GList *bl)
 static gint
 filter_eq (EFilterRule *fr, EFilterRule *cm)
 {
-        return E_FILTER_RULE_CLASS (parent_class)->eq (fr, cm)
+	return E_FILTER_RULE_CLASS (parent_class)->eq (fr, cm)
 		&& list_eq (((EMFilterRule *)fr)->actions,((EMFilterRule *)cm)->actions);
 }
 
@@ -220,7 +220,7 @@ xml_encode (EFilterRule *fr)
 	xmlNodePtr node, set, work;
 	GList *l;
 
-        node = E_FILTER_RULE_CLASS (parent_class)->xml_encode (fr);
+	node = E_FILTER_RULE_CLASS (parent_class)->xml_encode (fr);
 	g_return_val_if_fail (node != NULL, NULL);
 	set = xmlNewNode(NULL, (const guchar *)"actionset");
 	xmlAddChild (node, set);
@@ -269,7 +269,7 @@ xml_decode (EFilterRule *fr, xmlNodePtr node, ERuleContext *rc)
 	xmlNodePtr work;
 	gint result;
 
-        result = E_FILTER_RULE_CLASS (parent_class)->xml_decode (fr, node, rc);
+	result = E_FILTER_RULE_CLASS (parent_class)->xml_decode (fr, node, rc);
 	if (result != 0)
 		return result;
 
@@ -313,7 +313,7 @@ rule_copy (EFilterRule *dest, EFilterRule *src)
 
 /*static void build_code(EFilterRule *fr, GString *out)
 {
-        return FILTER_RULE_CLASS (parent_class)->build_code (fr, out);
+	return FILTER_RULE_CLASS (parent_class)->build_code (fr, out);
 }*/
 
 struct _part_data {
@@ -530,7 +530,7 @@ get_widget (EFilterRule *fr, ERuleContext *rc)
 	gint rows, i = 0;
 	gchar *msg;
 
-        widget = E_FILTER_RULE_CLASS (parent_class)->get_widget (fr, rc);
+	widget = E_FILTER_RULE_CLASS (parent_class)->get_widget (fr, rc);
 
 	/* and now for the action area */
 	msg = g_strdup_printf("<b>%s</b>", _("Then"));
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 088c6c761f..1d11a72c2d 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -333,7 +333,7 @@ list_eq (GList *al, GList *bl)
 static gint
 vfolder_eq (EFilterRule *fr, EFilterRule *cm)
 {
-        return E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->eq (fr, cm)
+	return E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->eq (fr, cm)
 		&& list_eq (((EMVFolderRule *)fr)->sources, ((EMVFolderRule *)cm)->sources);
 }
 
@@ -344,7 +344,7 @@ xml_encode (EFilterRule *fr)
 	xmlNodePtr node, set, work;
 	GList *l;
 
-        node = E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->xml_encode (fr);
+	node = E_FILTER_RULE_CLASS (em_vfolder_rule_parent_class)->xml_encode (fr);
 	g_return_val_if_fail (node != NULL, NULL);
 	g_return_val_if_fail (vr->with < G_N_ELEMENTS (with_names), NULL);
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 1c17024f39..3ca7b23d58 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -418,7 +418,7 @@ build_dialog (GtkWindow *parent,
 	GList *list = NULL;
 	struct _send_data *data;
 	GtkWidget *container;
-        GtkWidget *send_icon;
+	GtkWidget *send_icon;
 	GtkWidget *recv_icon;
 	GtkWidget *scrolled_window;
 	GtkWidget *label;
diff --git a/mail/message-list.c b/mail/message-list.c
index ef1eac2278..cd72098397 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4664,8 +4664,8 @@ regen_list_done (struct _regen_list_msg *m)
 	} else
 		build_flat (m->ml, m->summary, m->changes);
 
-        if (m->ml->search && m->ml->search != m->search)
-                g_free (m->ml->search);
+	if (m->ml->search && m->ml->search != m->search)
+		g_free (m->ml->search);
 	m->ml->search = m->search;
 	m->search = NULL;