Peer-to-Peer (P2P) networks are frequenlty used for data sharing over mobile ad hoc networks (MANETs) due to their decentralization and high tolerance to failures. However, P2P networks do not perform well on MANETs. Structured P2P networks have a high level of unsuccessful queries due to the message drops, while unstructured networks saturate quickly due to the high number of messages sent. This work proposes ameliorations to both P2P approaches. Our solutions reduce the average energy consumption and delay in unstructured approaches at the expense of a smaller loss on the success ratio, while in structured approaches our modifications increase the success ratio at the expense of average energy consumption and delay.