When the Prophet (ﷺ) went out for the `Umra in the month of Dhal-Qa'da, the people of Mecca did not allow him to enter Mecca till he agreed to conclude a peace treaty with them by virtue of which he would stay in Mecca for three days only (in the following year). When the agreement was being written, the Muslims wrote: This is the peace treaty, which Muhammad, Apostle of Allah has concluded. The infidels said (to the Prophet), We do not agree with you on this, for if we knew that you are Apostle of Allah we would not have prevented you for anything (i.e. entering Mecca, etc.), but you are Muhammad, the son of `Abdullah. Then he said to `Ali, Erase (the name of) 'Apostle of Allah'. `Ali said, No, by Allah, I will never erase you (i.e. your name). Then Allah's Messenger (ﷺ) took the writing sheet...and he did not know a better writing..and he wrote or got it the following written! This is the peace treaty which Muhammad, the son of `Abdullah, has concluded: Muhammad should not bring arms into Mecca except sheathed swords, and should not take with him any person of the people of Mecca even if such a person wanted to follow him, and if any of his companions wants to stay in Mecca, he should not forbid him. (In the next year) when the Prophet (ﷺ) entered Mecca and the allowed period of stay elapsed, the infidels came to `Ali and said Tell your companion (Muhammad) to go out, as the allowed period of his stay has finished. So the Prophet (ﷺ) departed (from Mecca) and the daughter of Hamza followed him shouting O Uncle, O Uncle! `Ali took her by the hand and said to Fatima, Take the daughter of your uncle. So she made her ride (on her horse). (When they reached Medina) `Ali, Zaid and Ja`far quarreled about her. `Ali said, I took her for she is the daughter of my uncle. Ja`far said, She is the daughter of my uncle and her aunt is my wife. Zaid said, She is the daughter of my brother. On that, the Prophet (ﷺ) gave her to her aunt and said, The aunt is of the same status as the mother. He then said to `Ali, You are from me, and I am from you, and said to Ja`far, You resemble me in appearance and character, and said to Zaid, You are our brother and our freed slave. `Ali said to the Prophet 'Won't you marry the daughter of Hamza? The Prophet (ﷺ) said, She is the daughter of my foster brother.

Allah's Messenger (ﷺ) set out with the intention of performing `Umra, but the infidels of Quraish intervened between him and the Ka`ba, so the Prophet (ﷺ) slaughtered his Hadi (i.e. sacrificing animals and shaved his head at Al-Hudaibiya and concluded a peace treaty with them (i.e. the infidels) on condition that he would perform the `Umra the next year and that he would not carry arms against them except swords, and would not stay (in Mecca) more than what they would allow. So the Prophet (ﷺ) performed the `Umra in the following year and according to the peace treaty, he entered Mecca, and when he had stayed there for three days, the infidels ordered him to leave, and he left.

When Allah's Messenger (ﷺ) performed the `Umra (which he performed in the year following the treaty of Al-Hudaibiya) we were screening Allah's Messenger (ﷺ) from the infidels and their boys lest they should harm him.

When Allah's Messenger (ﷺ) and his companions arrived (at Mecca), the pagans said, There have come to you a group of people who have been weakened by the fever of Yathrib (i.e. Medina). So the Prophet (ﷺ) ordered his companions to do Ramal (i.e. fast walking) in the first three rounds of Tawaf around the Ka`ba and to walk in between the two corners (i.e. the black stone and the Yemenite corner). The only cause which prevented the Prophet (ﷺ) from ordering them to do Ramal in all the rounds of Tawaf, was that he pitied them.

The Prophet (ﷺ) hastened in going around the Ka`ba and between the Safa and Marwa in order to show the pagans his strength. Ibn `Abbas added, When the Prophet (ﷺ) arrived (at Mecca) in the year of peace (following that of Al-Hudaibiya treaty with the pagans of Mecca), he (ordered his companions) to do Ramal in order to show their strength to the pagans and the pagans were watching (the Muslims) from (the hill of) Quaiqan.

The Prophet (ﷺ) married Maimuna while he was in the state of lhram but he consummated that marriage after finishing that state. Maimuna died at Saraf (i.e. a place near Mecca).