Index: apps/metadata/mp3.c
===================================================================
--- apps/metadata/mp3.c	(revision 25136)
+++ apps/metadata/mp3.c	(working copy)
@@ -1124,6 +1124,17 @@
 }
 
 /*
+ * Checks whether the given mp3entry contains title information.
+ */
+static bool is_mp3_title_empty(struct mp3entry *entry)
+{
+    if (entry->title == NULL && entry->artist == NULL && entry->album == NULL)
+        return true;
+    else
+        return false;   
+}
+
+/*
  * Checks all relevant information (such as ID3v1 tag, ID3v2 tag, length etc)
  * about an MP3 file and updates it's entry accordingly.
  *
@@ -1153,8 +1164,9 @@
        the true size of the MP3 stream */
     entry->filesize -= entry->first_frame_offset;
 
-    /* only seek to end of file if no id3v2 tags were found */
-    if (!entry->id3v2len) {
+    /* Only seek to end of file if no id3v2 tags were found or there is no
+     * title information contained in the id3v2 tag */
+    if (!entry->id3v2len || is_mp3_title_empty(entry)) {
         setid3v1title(fd, entry);
     }