diff --git a/src/mu-msg-part.c b/src/mu-msg-part.c
index 6f39338e..7363dfa3 100644
--- a/src/mu-msg-part.c
+++ b/src/mu-msg-part.c
@@ -619,7 +619,7 @@ mu_msg_part_find_cid (MuMsg *msg, const char* sought_cid)
 
 	return msg_part_find_idx (msg->_file->_mime_msg,
 				  (MatchFunc)match_content_id,
-				  (gpointer)cid);
+				  (gpointer)(char*)cid);
 }
 
 struct _MatchData2 {
diff --git a/src/mu-query.cc b/src/mu-query.cc
index 51473f32..db68de04 100644
--- a/src/mu-query.cc
+++ b/src/mu-query.cc
@@ -332,7 +332,7 @@ mu_query_run (MuQuery *self, const char* searchexpr, gboolean threads,
 		enq.set_cutoff(0,0);
 
 		return mu_msg_iter_new (
-			(XapianEnquire*)&enq,
+			reinterpret_cast<XapianEnquire*>(&enq),
 			maxnum <= 0 ? self->db().get_doccount() : maxnum,
 			threads,
 			threads ? sortfieldid : MU_MSG_FIELD_ID_NONE,