diff --git a/src/amqp_message.cpp b/src/amqp_message.cpp
index f0c8088..2da7f60 100644
--- a/src/amqp_message.cpp
+++ b/src/amqp_message.cpp
@@ -42,7 +42,7 @@ qlonglong Message::deliveryTag() const
     return d->deliveryTag;
 }
 
-bool Message::redelivered() const
+bool Message::isRedelivered() const
 {
     return d->redelivered;
 }
@@ -62,11 +62,6 @@ QByteArray Message::payload() const
     return d->payload;
 }
 
-Frame::TableField Message::headers() const
-{
-    return d->headers;
-}
-
 bool Message::hasProperty(Property property) const
 {
     return d->properties.contains(property);
@@ -81,3 +76,18 @@ QVariant Message::property(Property property, const QVariant &defaultValue) cons
 {
     return d->properties.value(property, defaultValue);
 }
+
+bool Message::hasHeader(const QString &header) const
+{
+    return d->headers.contains(header);
+}
+
+void Message::setHeader(const QString &header, const QVariant &value)
+{
+    d->headers.insert(header, value);
+}
+
+QVariant Message::header(const QString &header, const QVariant &defaultValue) const
+{
+    return d->headers.value(header, defaultValue);
+}
diff --git a/src/amqp_message.h b/src/amqp_message.h
index de2cfc7..3def27b 100644
--- a/src/amqp_message.h
+++ b/src/amqp_message.h
@@ -42,14 +42,17 @@ public:
     void setProperty(Property property, const QVariant &value);
     QVariant property(Property property, const QVariant &defaultValue = QString()) const;
 
+    bool hasHeader(const QString &header) const;
+    void setHeader(const QString &header, const QVariant &value);
+    QVariant header(const QString &header, const QVariant &defaultValue = QString()) const;
+
     bool isValid() const;
+    bool isRedelivered() const;
 
     qlonglong deliveryTag() const;
-    bool redelivered() const;
     QString exchangeName() const;
     QString routingKey() const;
     QByteArray payload() const;
-    Frame::TableField headers() const;
 
 private:
     QSharedDataPointer<MessagePrivate> d;
diff --git a/src/amqp_message_p.h b/src/amqp_message_p.h
index f26467d..adb8deb 100644
--- a/src/amqp_message_p.h
+++ b/src/amqp_message_p.h
@@ -20,7 +20,7 @@ public:
     QString routingKey;
     QByteArray payload;
     QHash<Message::Property, QVariant> properties;
-    Frame::TableField headers;
+    QHash<QString, QVariant> headers;
     int leftSize;
 
 };