diff --git a/degesch.c b/degesch.c
index 0c9e19f..86ced13 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1064,7 +1064,7 @@ initiate_quit (struct app_context *ctx)
 	rl_callback_handler_remove ();
 
 	// Initiate a connection close
-	buffer_send_status (ctx, ctx->global_buffer, "shutting down");
+	buffer_send_status (ctx, ctx->global_buffer, "Shutting down");
 	if (ctx->irc_fd != -1)
 		irc_shutdown (ctx);
 
@@ -1163,7 +1163,7 @@ irc_initialize_ssl_ctx (struct app_context *ctx, struct error **e)
 			return true;
 
 		error_set (&error, "%s: %s",
-			"failed to set locations for the CA certificate bundle",
+			"Failed to set locations for the CA certificate bundle",
 			ERR_reason_error_string (ERR_get_error ()));
 		goto ca_error;
 	}
@@ -1171,7 +1171,7 @@ irc_initialize_ssl_ctx (struct app_context *ctx, struct error **e)
 	if (!SSL_CTX_set_default_verify_paths (ctx->ssl_ctx))
 	{
 		error_set (&error, "%s: %s",
-			"couldn't load the default CA certificate bundle",
+			"Couldn't load the default CA certificate bundle",
 			ERR_reason_error_string (ERR_get_error ()));
 		goto ca_error;
 	}
@@ -1294,7 +1294,7 @@ irc_establish_connection (struct app_context *ctx,
 
 		char *address = format_host_port_pair (real_host, port);
 		buffer_send_status (ctx, ctx->server_buffer,
-			"connecting to %s...", address);
+			"Connecting to %s...", address);
 		free (address);
 
 		if (!connect (sockfd, gai_iter->ai_addr, gai_iter->ai_addrlen))
@@ -1655,7 +1655,7 @@ irc_process_message (const struct irc_message *msg,
 		|| !strcasecmp (msg->command, "422")))  // ERR_NOMOTD
 	{
 		// XXX: should we really print this?
-		buffer_send_status (ctx, ctx->server_buffer, "successfully connected");
+		buffer_send_status (ctx, ctx->server_buffer, "Successfully connected");
 		ctx->irc_ready = true;
 		refresh_prompt (ctx);
 
@@ -1772,19 +1772,19 @@ handle_command_buffer (struct app_context *ctx, char *arguments)
 		if (!buffer)
 		{
 			buffer_send_error (ctx, ctx->global_buffer,
-				"%s: %s", "no such buffer", which);
+				"%s: %s", "No such buffer", which);
 			return;
 		}
 		if (buffer == ctx->global_buffer)
 		{
 			buffer_send_error (ctx, ctx->global_buffer,
-				"can't close the global buffer");
+				"Can't close the global buffer");
 			return;
 		}
 		if (buffer == ctx->server_buffer)
 		{
 			buffer_send_error (ctx, ctx->global_buffer,
-				"can't close the server buffer");
+				"Can't close the server buffer");
 			return;
 		}
 
@@ -1938,7 +1938,7 @@ process_user_command (struct app_context *ctx, char *command)
 		handler->handler (ctx, command);
 	else
 		buffer_send_error (ctx, ctx->global_buffer,
-			"%s: %s", "no such command", name);
+			"%s: %s", "No such command", name);
 }
 
 static void
@@ -1951,7 +1951,7 @@ send_message_to_current_buffer (struct app_context *ctx, char *message)
 	{
 	case BUFFER_GLOBAL:
 	case BUFFER_SERVER:
-		buffer_send_error (ctx, buffer, "this buffer is not a channel");
+		buffer_send_error (ctx, buffer, "This buffer is not a channel");
 		break;
 	case BUFFER_CHANNEL:
 	case BUFFER_PM:
@@ -2080,7 +2080,7 @@ irc_queue_reconnect (struct app_context *ctx)
 {
 	hard_assert (ctx->irc_fd == -1);
 	buffer_send_status (ctx, ctx->server_buffer,
-		"trying to reconnect in %ld seconds...", ctx->reconnect_delay);
+		"Trying to reconnect in %ld seconds...", ctx->reconnect_delay);
 	poller_timer_set (&ctx->reconnect_tmr, ctx->reconnect_delay * 1000);
 }
 
@@ -2118,7 +2118,7 @@ static void
 on_irc_ping_timeout (void *user_data)
 {
 	struct app_context *ctx = user_data;
-	buffer_send_error (ctx, ctx->server_buffer, "connection timeout");
+	buffer_send_error (ctx, ctx->server_buffer, "Connection timeout");
 	on_irc_disconnected (ctx);
 }
 
@@ -2162,12 +2162,12 @@ on_irc_readable (const struct pollfd *fd, struct app_context *ctx)
 			goto end;
 		case IRC_READ_ERROR:
 			buffer_send_error (ctx, ctx->server_buffer,
-				"reading from the IRC server failed");
+				"Reading from the IRC server failed");
 			disconnected = true;
 			goto end;
 		case IRC_READ_EOF:
 			buffer_send_error (ctx, ctx->server_buffer,
-				"the IRC server closed the connection");
+				"The IRC server closed the connection");
 			disconnected = true;
 			goto end;
 		case IRC_READ_OK:
@@ -2177,7 +2177,7 @@ on_irc_readable (const struct pollfd *fd, struct app_context *ctx)
 		if (buf->len >= (1 << 20))
 		{
 			buffer_send_error (ctx, ctx->server_buffer,
-				"the IRC server seems to spew out data frantically");
+				"The IRC server seems to spew out data frantically");
 			irc_shutdown (ctx);
 			goto end;
 		}
@@ -2224,7 +2224,7 @@ irc_connect (struct app_context *ctx, struct error **e)
 		char *address = format_host_port_pair (irc_host, irc_port);
 		char *socks_address = format_host_port_pair (socks_host, socks_port);
 		buffer_send_status (ctx, ctx->server_buffer,
-			"connecting to %s via %s...", address, socks_address);
+			"Connecting to %s via %s...", address, socks_address);
 		free (socks_address);
 		free (address);
 
@@ -2248,7 +2248,7 @@ irc_connect (struct app_context *ctx, struct error **e)
 		ctx->irc_fd = -1;
 		return false;
 	}
-	buffer_send_status (ctx, ctx->server_buffer, "connection established");
+	buffer_send_status (ctx, ctx->server_buffer, "Connection established");
 
 	poller_fd_init (&ctx->irc_event, &ctx->poller, ctx->irc_fd);
 	ctx->irc_event.dispatcher = (poller_fd_fn) on_irc_readable;