diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index bba3969265..d094772005 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -1926,6 +1926,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
          return "succeeded";
       case MSG_FAILED:
          return "failed";
+      case MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER:
+         return "File already exists. Saving to backup buffer";
       case MSG_AUTOLOADING_SAVESTATE_FROM:
          return "Auto-loading savestate from";
       case MSG_REBOOTING:
diff --git a/msg_hash.h b/msg_hash.h
index f589976e47..960a5b6cce 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -214,6 +214,7 @@ enum msg_hash_enums
    MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY,
    MSG_AUTOCONFIG_FILE_ERROR_SAVING,
    MSG_OVERRIDES_ERROR_SAVING,
+   MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER,
    MSG_AUTOLOADING_SAVESTATE_FROM,
    MSG_FOUND_AUTO_SAVESTATE_IN,
    MSG_SRAM_WILL_NOT_BE_SAVED,
diff --git a/tasks/task_save.c b/tasks/task_save.c
index ffa6f48617..46f4ee883b 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -378,8 +378,10 @@ bool content_undo_load_state(void)
          undo_load_buf.size,
          msg_hash_to_str(MSG_BYTES));
 
-     /* TODO/FIXME - This checking of SRAM overwrite, the backing up of it and
-   its flushing could all be in their own functions... */
+   /* TODO/FIXME - This checking of SRAM overwrite, 
+    * the backing up of it and
+    * its flushing could all be in their 
+    * own functions... */
    if (settings->block_sram_overwrite && task_save_files
          && task_save_files->size)
    {
@@ -452,7 +454,7 @@ bool content_undo_load_state(void)
       if (blocks[i].data)
       {
          retro_ctx_memory_info_t    mem_info;
-         void *ptr = NULL;
+         void *ptr   = NULL;
 
          mem_info.id = blocks[i].type;
 
@@ -527,9 +529,9 @@ static void task_save_handler_finished(retro_task_t *task,
  **/
 static void task_save_handler(retro_task_t *task)
 {
-   save_task_state_t *state = (save_task_state_t*)task->state;
    int written;
    ssize_t remaining;
+   save_task_state_t *state = (save_task_state_t*)task->state;
 
    if (!state->file)
    {
@@ -539,13 +541,13 @@ static void task_save_handler(retro_task_t *task)
          return;
    }
 
-   remaining = MIN(state->size - state->written, SAVE_STATE_CHUNK);
-
-   written = filestream_write(state->file, (uint8_t*)state->data + state->written, remaining);
+   remaining       = MIN(state->size - state->written, SAVE_STATE_CHUNK);
+   written         = filestream_write(state->file,
+         (uint8_t*)state->data + state->written, remaining);
 
    state->written += written;
 
-   task->progress = (state->written / (float)state->size) * 100;
+   task->progress  = (state->written / (float)state->size) * 100;
 
    if (task->cancelled || written != remaining)
    {
@@ -673,7 +675,8 @@ static void task_load_handler_finished(retro_task_t *task,
       save_task_state_t *state)
 {
    load_task_data_t *task_data = NULL;
-   task->finished = true;
+
+   task->finished              = true;
 
    if (state->file)
       filestream_close(state->file);
@@ -697,9 +700,8 @@ static void task_load_handler_finished(retro_task_t *task,
  **/
 static void task_load_handler(retro_task_t *task)
 {
+   ssize_t remaining, bytes_read;
    save_task_state_t *state = (save_task_state_t*)task->state;
-   ssize_t remaining;
-   ssize_t bytes_read;
 
    if (!state->file)
    {
@@ -724,14 +726,13 @@ static void task_load_handler(retro_task_t *task)
          goto error;
    }
 
-   remaining = MIN(state->size - state->bytes_read, SAVE_STATE_CHUNK);
-
-   bytes_read = filestream_read(state->file, (uint8_t*)state->data + state->bytes_read, remaining);
-
+   remaining          = MIN(state->size - state->bytes_read, SAVE_STATE_CHUNK);
+   bytes_read         = filestream_read(state->file,
+         (uint8_t*)state->data + state->bytes_read, remaining);
    state->bytes_read += bytes_read;
 
    if (state->size > 0)
-      task->progress = (state->bytes_read / (float)state->size) * 100;
+      task->progress  = (state->bytes_read / (float)state->size) * 100;
 
    if (task->cancelled || bytes_read != remaining)
    {
@@ -1126,8 +1127,8 @@ bool content_save_state(const char *path, bool save_to_disk, bool autosave)
             /* Before overwritting the savestate file, load it into a buffer
             to allow undo_save_state() to work */
             /* TODO/FIXME - Use msg_hash_to_str here */
-            RARCH_LOG("%s\n",
-               "File already exists. Saving to backup buffer...");
+            RARCH_LOG("%s ...\n",
+                  msg_hash_to_str(MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER));
 
             task_push_load_and_save_state(path, data, info.size, true, autosave);
          }