diff --git a/src/Decho/Views/ChatView.axaml b/src/Decho/Views/ChatView.axaml
index 6326224..ed01f55 100644
--- a/src/Decho/Views/ChatView.axaml
+++ b/src/Decho/Views/ChatView.axaml
@@ -5,7 +5,7 @@
 			 xmlns:i="https://github.com/projektanker/icons.avalonia"
 			 x:Class="Decho.Views.ChatView"
 			 x:DataType="vm:ChatViewModel">
-	<Grid RowDefinitions="Auto, Auto, *, Auto" Margin="10">
+	<Grid RowDefinitions="Auto, Auto, *, 5, Auto" Margin="10">
 		<Grid ColumnDefinitions="*, Auto">
 			<StackPanel Orientation="Horizontal">
 				<TextBlock FontWeight="Bold"
@@ -28,7 +28,7 @@
 					Classes="IconButton" />
 		</Grid>
 		<views:MessageListView Grid.Row="2" />
-		<views:MessageComposerView Grid.Row="3"
+		<views:MessageComposerView Grid.Row="4"
 								   DataContext="{Binding Composer}" />
 	</Grid>
 </UserControl>
diff --git a/src/Decho/Views/SidebarView.axaml b/src/Decho/Views/SidebarView.axaml
index 5cfd2b2..f7d81e2 100644
--- a/src/Decho/Views/SidebarView.axaml
+++ b/src/Decho/Views/SidebarView.axaml
@@ -6,7 +6,7 @@
 			 x:Class="Decho.Views.SidebarView"
 			 x:DataType="vm:SidebarViewModel">
 	<Border Background="{DynamicResource UiTheme00}" Width="250" CornerRadius="0 6 0 0">
-		<ScrollViewer Padding="5 5 5 -5">
+		<ScrollViewer Margin="5">
 			<ItemsControl ItemsSource="{Binding Servers}">
 				<ItemsControl.ItemTemplate>
 					<DataTemplate x:DataType="vm:ServerViewModel">