+gboolean
+modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self)
+{
+ ModestTnySendQueuePrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_TNY_SEND_QUEUE(self), FALSE);
+
+ priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+ return priv->current != NULL;
+}
+
+ModestTnySendQueueStatus
+modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg_id)
+{
+ GList *item;
+
+ g_return_val_if_fail (MODEST_IS_TNY_SEND_QUEUE(self), MODEST_TNY_SEND_QUEUE_UNKNOWN);
+ g_return_val_if_fail (msg_id, MODEST_TNY_SEND_QUEUE_UNKNOWN);
+
+ item = modest_tny_send_queue_lookup_info (self, msg_id);
+ if (!item)
+ return MODEST_TNY_SEND_QUEUE_UNKNOWN;
+ else
+ return ((SendInfo*)item->data)->status;
+}
+
+gchar *
+modest_tny_send_queue_get_msg_id (TnyHeader *header)
+{
+ gchar* msg_uid = NULL;
+ const gchar *subject;
+ time_t date_received;
+
+ g_return_val_if_fail (header && TNY_IS_HEADER(header), NULL);
+
+ /* Get message uid */
+ subject = tny_header_get_subject (header);
+ date_received = tny_header_get_date_received (header);
+
+ msg_uid = g_strdup_printf ("%s %d", subject, (int) date_received);
+
+ return msg_uid;
+}
+
+
+static void
+_on_msg_start_sending (TnySendQueue *self,
+ TnyHeader *header,
+ TnyMsg *msg,
+ int done,
+ int total,
+ gpointer user_data)
+{
+ ModestTnySendQueuePrivate *priv = NULL;
+ GList *item = NULL;
+ SendInfo *info = NULL;
+ gchar *msg_id = NULL;
+
+ priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+ /* Get message uid */
+ msg_id = modest_tny_send_queue_get_msg_id (header);
+
+ /* Get status info */
+ item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+
+ /* Set current status item */
+ info = item->data;
+ info->status = MODEST_TNY_SEND_QUEUE_SENDING;
+ g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
+ priv->current = item;
+
+ /* free */
+ g_free (msg_id);
+}
+
+static void
+_on_msg_has_been_sent (TnySendQueue *self,
+ TnyHeader *header,
+ TnyMsg *msg,
+ int done,
+ int total,
+ gpointer user_data)