diff --git a/src/controller/buffers.py b/src/controller/buffers.py
index 60f279b..37b1cbd 100644
--- a/src/controller/buffers.py
+++ b/src/controller/buffers.py
@@ -736,7 +736,8 @@ class chatBuffer(baseBuffer):
 		self.tab.set_focus_function(self.onFocus)
 
 	def catch_enter(self, event, *args, **kwargs):
-		if event.GetKeyCode() == wx.WXK_RETURN:
+		shift=event.ShiftDown()
+		if event.GetKeyCode() == wx.WXK_RETURN and shift == False:
 			self.send_chat_to_user()
 		event.Skip()
 
diff --git a/src/wxUI/tabs/home.py b/src/wxUI/tabs/home.py
index 196e3ad..9e6bd78 100644
--- a/src/wxUI/tabs/home.py
+++ b/src/wxUI/tabs/home.py
@@ -168,7 +168,7 @@ class chatTab(wx.Panel):
 
 	def create_chat(self):
 		lbl2 = wx.StaticText(self, -1, _(u"Write a message"))
-		self.text = wx.TextCtrl(self, -1)
+		self.text = wx.TextCtrl(self, -1, size=(400, -1), style=wx.TE_MULTILINE)
 		box = wx.BoxSizer(wx.HORIZONTAL)
 		box.Add(lbl2, 0, wx.ALL, 20)
 		box.Add(self.text, 0, wx.ALL, 5)