diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07a6454b9..46d6482dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,6 +27,7 @@ set(keepassx_SOURCES
     core/EntryAttachments.cpp
     core/EntryAttributes.cpp
     core/Group.cpp
+    core/ListDeleter.h
     core/Metadata.cpp
     core/qsavefile.cpp
     core/TimeInfo.cpp
diff --git a/src/core/ListDeleter.h b/src/core/ListDeleter.h
new file mode 100644
index 000000000..76c7bda9a
--- /dev/null
+++ b/src/core/ListDeleter.h
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 or (at your option)
+ *  version 3 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KEEPASSX_LISTDELETER_H
+#define KEEPASSX_LISTDELETER_H
+
+#include <QtCore/QList>
+
+template <typename T>
+class ListDeleter
+{
+public:
+    inline explicit ListDeleter(QList<T>* list) : m_list(list) {}
+    inline ~ListDeleter() {
+        qDeleteAll(*m_list);
+    }
+
+private:
+    QList<T>* m_list;
+};
+
+#endif // KEEPASSX_LISTDELETER_H