diff --git a/.bash_profile b/.bash_profile
index a7c6dcf..50845ba 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -74,16 +74,16 @@ hash ssh-add ssh-agent >/dev/null 2>&1 && {
 hash screen >/dev/null 2>&1 && {
   if [ ! -e ~/.hushlogin ]; then
     if [ ! -z "$STY" ]; then
-      echo
       echo "Screen $STY, window $WINDOW."
+      echo
     else
       _SCREENS="$( screen -ls | grep '[[:alpha:]]' | egrep -v '^([[:digit:]]+|No) Socket(s)?' )"
       if [ -n "$_SCREENS" ]; then
-        echo
         echo "$_SCREENS"
-      else
         echo
+      else
         echo "No screens."
+        echo
       fi
       unset _SCREENS
     fi
@@ -94,16 +94,14 @@ hash screen >/dev/null 2>&1 && {
 [ ! -z "$SSH_CONNECTION" ] && {
   if [ -s /var/spool/mail/$USER ]; then
     if [ -N /var/spool/mail/$USER ]; then
-      echo
       echo "You have new mail."
-    else
       echo
+    else
       echo "You have mail."
+      echo
     fi
 #  else
-#    echo
 #    echo "No mail."
+#    echo
   fi
 }
-
-echo