diff --git a/include/axolotl/list.hh b/include/axolotl/list.hh
index ae41baa..a3c3d01 100644
--- a/include/axolotl/list.hh
+++ b/include/axolotl/list.hh
@@ -18,12 +18,12 @@ public:
     /**
      * Is the list empty?
      */
-    bool empty() { return _end == _data; }
+    bool empty() const { return _end == _data; }
 
     /**
      * The number of items in the list.
      */
-    std::size_t size() { return _end - _data; }
+    std::size_t size() const { return _end - _data; }
 
     T & operator[](std::size_t index) { return _data[index]; }
 
diff --git a/include/axolotl/message.hh b/include/axolotl/message.hh
index 85579cf..ac4b3e0 100644
--- a/include/axolotl/message.hh
+++ b/include/axolotl/message.hh
@@ -29,7 +29,6 @@ struct MessageReader {
     std::uint32_t counter;
     std::size_t ratchet_key_length;
     std::size_t ciphertext_length;
-    std::size_t mac_length;
     std::uint8_t const * ratchet_key;
     std::uint8_t const * ciphertext;
     std::uint8_t const * mac;
diff --git a/src/message.cpp b/src/message.cpp
index d0e45e0..18dbe0e 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -120,7 +120,6 @@ axolotl::MessageReader axolotl::decode_message(
     std::uint8_t const * end = input + input_length - mac_length;
     std::uint8_t flags = 0;
     result.mac = end;
-    result.mac_length = mac_length;
     if (pos == end) return result;
     result.version = *(pos++);
     while (pos != end) {
diff --git a/tests/test_message.cpp b/tests/test_message.cpp
index a09d7e7..242243b 100644
--- a/tests/test_message.cpp
+++ b/tests/test_message.cpp
@@ -20,7 +20,6 @@ assert_equals(std::uint8_t(3), reader.version);
 assert_equals(std::uint32_t(1), reader.counter);
 assert_equals(std::size_t(10), reader.ratchet_key_length);
 assert_equals(std::size_t(10), reader.ciphertext_length);
-assert_equals(std::size_t(8), reader.mac_length);
 
 assert_equals(ratchetkey, reader.ratchet_key, 10);
 assert_equals(ciphertext, reader.ciphertext, 10);
@@ -47,7 +46,6 @@ std::memcpy(writer.mac, hmacsha2, 8);
 
 assert_equals(message2, output, 35);
 
-
 } /* Message encode test */
 
 }