3 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 781f654a3..ea0d72d9a 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -356,8 +356,13 @@ void ListWidget::updateList()
         emit positionChanged(0, qMax(0, m_model->count() - m_rows));
     }
 
-    m_titles = m_model->getTitles(m_first, m_rows);
-    m_times  = m_model->getTimes(m_first, m_rows);
+    m_titles.clear();
+    m_times.clear();
+    foreach (PlayListItem *item, m_model->mid(m_first, m_rows))
+    {
+        m_titles.append(item->formattedTitle());
+        m_times.append(item->formattedLength());
+    }
     m_scroll = false;
     //add numbers
     for (int i = 0; i < m_titles.size() && m_show_number && !m_align_numbres; ++i)
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index a67c7037a..c042e757b 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -182,7 +182,7 @@ void MainWindow::showState(Qmmp::State state)
     case Qmmp::Stopped:
         m_playlist->setTime(-1);
         if (m_playlist->currentItem())
-            setWindowTitle(m_playlist->currentItem()->text());
+            setWindowTitle(m_playlist->currentItem()->formattedTitle());
         else
             setWindowTitle("Qmmp");
         break;
@@ -194,7 +194,7 @@ void MainWindow::showMetaData()
     if (m_playlist->currentItem() &&
         m_playlist->currentItem()->url() == m_core->metaData().value(Qmmp::URL))
     {
-        setWindowTitle(m_playlist->currentItem()->text());
+        setWindowTitle(m_playlist->currentItem()->formattedTitle());
     }
 }
 
diff --git a/src/plugins/Ui/skinned/playlisttitlebar.cpp b/src/plugins/Ui/skinned/playlisttitlebar.cpp
index a714cb223..3c5e5d55e 100644
--- a/src/plugins/Ui/skinned/playlisttitlebar.cpp
+++ b/src/plugins/Ui/skinned/playlisttitlebar.cpp
@@ -266,7 +266,7 @@ void PlayListTitleBar::showCurrent()
         if (info)
         {
             m_text = QString("%1. %2").arg(m_model->currentIndex()+1)
-                    .arg(info->text());
+                    .arg(info->formattedTitle());
             if(info->length())
             {
                 m_text.append(QString("  (%1:%2)").arg(info->length()/60)