diff --git a/toxygen/mainscreen.py b/toxygen/mainscreen.py
index 6b50a8a..baa7ae2 100644
--- a/toxygen/mainscreen.py
+++ b/toxygen/mainscreen.py
@@ -372,7 +372,7 @@ class MainWindow(QtGui.QMainWindow, Singleton):
         self.close()
 
     def resizeEvent(self, *args, **kwargs):
-        self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 155)
+        self.messages.setGeometry(0, 0, self.width() - 270, self.height() - 158)
         self.friends_list.setGeometry(0, 0, 270, self.height() - 125)
 
         self.videocallButton.setGeometry(QtCore.QRect(self.width() - 330, 10, 50, 50))
diff --git a/toxygen/util.py b/toxygen/util.py
index 5ea50de..c8cd6f4 100644
--- a/toxygen/util.py
+++ b/toxygen/util.py
@@ -32,7 +32,8 @@ def copy(src, dest):
 
 
 def remove(folder):
-    shutil.rmtree(folder)
+    if os.path.isdir(folder):
+        shutil.rmtree(folder)
 
 
 def convert_time(t):