diff --git a/message_helpers.c b/message_helpers.c
index dfcd2f8..78851a7 100644
--- a/message_helpers.c
+++ b/message_helpers.c
@@ -4,9 +4,9 @@
 
 char* fetch_address(char* message) {
 	char* token = malloc (sizeof(char) * strlen(message));
-	token = strtok(message," \n");
+	token = strtok(message," \r\n");
 	if (strcmp(token,"TO:") == 0) {
-		token = strtok(NULL," \n");
+		token = strtok(NULL," \r\n");
 	} else {
 		return NULL;
 	}